Skip to content

Commit b30bf18

Browse files
author
Drone CI
committed
fixed a bug with source label value not being replaced in Promtail cfg. refs: #137649.
1 parent acfdff2 commit b30bf18

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v1.25
4+
5+
* fixed a bug with source label generic value not being replaced with INSTANCE_ID value in Promtail cfg
6+
37
## v1.24
48

59
* Fixed a bug with source editing for expression in match, etc

deploy-functions/SHA256SUMS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
b181ac206b2cb2e6991ed172e8435c77897c37678f72b0b29b9ceca6b00ed80f default-setup
2-
a53a76e7ac0c953143ca506b23d1e5d2975971e6d24f43ac3b8d39cb495217ed deploy-functions.sh
2+
ebf8ab45e92797f9e978fde6561aa7649468896a5d4423b9aee12c82d45a7b56 deploy-functions.sh

deploy-functions/deploy-functions.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
# shellcheck disable=SC2054,SC2015,SC2016,SC2034,SC2206,SC1001,SC2191,SC2128,SC2207
33

4-
declare -r df_ver=1.24
4+
declare -r df_ver=1.25
55

66
yq_cmd=$(command -v yq); declare -r yq_cmd
77
jq_cmd=$(command -v jq); declare -r jq_cmd
@@ -886,6 +886,7 @@ function setup_promtail() {
886886
key_exists_in_current_yml "promtail.labels.source" && \
887887
promtail_source=$(get_value 'promtail.labels.source' "${yml_current}") || \
888888
test -n "${promtail_source}" || promtail_source="${container_name}"
889+
key_exists_in_current_yml "promtail.source_exclude" && \
889890
promtail_source_exclude=$(get_value 'promtail.source_exclude' "${yml_current}") || \
890891
test -n "${promtail_source_exclude}" || promtail_source_exclude='filename'
891892
sed -e "s/\(instance:\).*/\1 ${promtail_instance}/g" -i "${promtail_conf}"

deploy-functions/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ umask 0077
55
export LANG=C
66
export LC_ALL=C
77

8-
df_ver=1.24
8+
df_ver=1.25
99
silent=no
1010
tmpdir="${TEMP:=/tmp}"
1111

deploy-functions/update.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ umask 0077
55
export LANG=C
66
export LC_ALL=C
77

8-
df_ver=1.24
8+
df_ver=1.25
99
silent=no
1010
tmpdir="${TEMP:=/tmp}"
1111

0 commit comments

Comments
 (0)