From 09fccd6b71ede4bf8ebf0035113d398561c73126 Mon Sep 17 00:00:00 2001 From: "Xiaoguang(William) Zhang" Date: Thu, 9 Jul 2020 12:46:46 -0400 Subject: [PATCH] Update alertmanager image to v0.20.0 Update alertmanager image from v0.11.0 to v0.20.0 Change-Id: I0ba14d1001a53964ebc28bc9ea9be999402d54fb --- .../templates/bin/_alertmanager.sh.tpl | 8 ++++---- prometheus-alertmanager/values.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl b/prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl index a710ae2b55..b09dc26601 100644 --- a/prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl +++ b/prometheus-alertmanager/templates/bin/_alertmanager.sh.tpl @@ -19,9 +19,9 @@ COMMAND="${@:-start}" function start () { exec /bin/alertmanager \ - -config.file=/etc/alertmanager/config.yml \ - -storage.path={{ .Values.conf.command_flags.storage.path }} \ - -mesh.listen-address={{ .Values.conf.command_flags.mesh.listen_address }} \ + --config.file=/etc/alertmanager/config.yml \ + --storage.path={{ .Values.conf.command_flags.storage.path }} \ + --cluster.listen-address={{ .Values.conf.command_flags.cluster.listen_address }} \ $(generate_peers) } @@ -29,7 +29,7 @@ function generate_peers () { final_pod_suffix=$(( {{ .Values.pod.replicas.alertmanager }}-1 )) for pod_suffix in `seq 0 "$final_pod_suffix"` do - echo -mesh.peer={{ .Release.Name }}-$pod_suffix.$DISCOVERY_SVC:$MESH_PORT + echo --cluster.peer={{ .Release.Name }}-$pod_suffix.$DISCOVERY_SVC:$MESH_PORT done } diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml index d01a82693d..43a5d14758 100644 --- a/prometheus-alertmanager/values.yaml +++ b/prometheus-alertmanager/values.yaml @@ -18,7 +18,7 @@ --- images: tags: - alertmanager: docker.io/prom/alertmanager:v0.11.0 + alertmanager: docker.io/prom/alertmanager:v0.20.0 dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent @@ -196,7 +196,7 @@ conf: command_flags: storage: path: /var/lib/alertmanager/data - mesh: + cluster: listen_address: "0.0.0.0:6783" alertmanager: global: