[prometheus] Fix AlertManager deploy.yaml missing `cluster.listen-add…

…ress` (#1270) * Fix AlertManager deploy.yaml missing cluster.listen-address Signed-off-by: Victor Godoy Hernández <vigohe@gmail.com> * bump up version Signed-off-by: Victor Godoy Hernández <vigohe@gmail.com> * Fix rendering of multiple clusterPeer Signed-off-by: Victor Godoy Hernández <vigohe@gmail.com> * Fix values.yaml doc Signed-off-by: Victor Godoy Hernández <vigohe@gmail.com> * fix clusterPeer to cluster.peer Signed-off-by: Victor Godoy Hernández <vigohe@gmail.com> * Fix indentation Signed-off-by: Victor Godoy Hernández <vigohe@gmail.com> Co-authored-by: André Bauer <monotek@users.noreply.github.com>
prometheus-community · Sep 21, 2021 · fff784c · fff784c
1 parent 05b6ade
commit fff784c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus
 appVersion: 2.26.0
-version: 14.7.0
+version: 14.7.1
 description: Prometheus is a monitoring system and time series database.
 home: https://prometheus.io/
 icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png

diff --git a/charts/prometheus/templates/alertmanager/deploy.yaml b/charts/prometheus/templates/alertmanager/deploy.yaml
@@ -60,13 +60,21 @@ spec:
           args:
             - --config.file=/etc/config/{{ .Values.alertmanager.configFileName }}
             - --storage.path={{ .Values.alertmanager.persistentVolume.mountPath }}
+          {{- if .Values.alertmanager.service.enableMeshPeer }}
+            - --cluster.listen-address=0.0.0.0:6783
             - --cluster.advertise-address=[$(POD_IP)]:6783
+          {{- else }}
+            - --cluster.listen-address=
+          {{- end }}
           {{- range $key, $value := .Values.alertmanager.extraArgs }}
             - --{{ $key }}={{ $value }}
           {{- end }}
           {{- if .Values.alertmanager.baseURL }}
             - --web.external-url={{ .Values.alertmanager.baseURL }}
           {{- end }}
+          {{- range .Values.alertmanager.clusterPeers }}
+            - --cluster.peer={{ . }}
+          {{- end }}
 
           ports:
             - containerPort: 9093

diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml
@@ -347,6 +347,10 @@ alertmanager:
     sessionAffinity: None
     type: ClusterIP
 
+  ## List of initial peers
+  ## Ref: https://github.com/prometheus/alertmanager/blob/main/README.md#high-availability
+  clusterPeers: []
+
 ## Monitors ConfigMap changes and POSTs to a URL
 ## Ref: https://github.com/jimmidyson/configmap-reload
 ##