From c01121f783531ac38c5d4e0266bd9c7069773108 Mon Sep 17 00:00:00 2001 From: Mario Finelli Date: Fri, 27 Sep 2024 10:21:25 +0200 Subject: [PATCH] Add support for alertmanager cluster.label Signed-off-by: Mario Finelli --- charts/kube-prometheus-stack/Chart.yaml | 2 +- .../templates/alertmanager/alertmanager.yaml | 3 +++ charts/kube-prometheus-stack/values.yaml | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 4d07d17a848..f16e8b58198 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,7 +23,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 63.0.0 +version: 63.1.0 appVersion: v0.76.1 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml index 656f0c8c02f..1b43f5b039c 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml @@ -172,6 +172,9 @@ spec: {{- if .Values.alertmanager.alertmanagerSpec.clusterPushpullInterval }} clusterPushpullInterval: {{ .Values.alertmanager.alertmanagerSpec.clusterPushpullInterval }} {{- end }} +{{- if .Values.alertmanager.alertmanagerSpec.clusterLabel }} + clusterLabel: {{ .Values.alertmanager.alertmanagerSpec.clusterLabel }} +{{- end }} {{- if .Values.alertmanager.alertmanagerSpec.forceEnableClusterMode }} forceEnableClusterMode: {{ .Values.alertmanager.alertmanagerSpec.forceEnableClusterMode }} {{- end }} diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index 68ea19334c1..f3d085b30fc 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -927,6 +927,9 @@ alertmanager: ## Needs to be specified as GoDuration, a time duration that can be parsed by Go’s time.ParseDuration() (e.g. 45ms, 30s, 1m, 1h20m15s) clusterPushpullInterval: "" + ## clusterLabel defines the identifier that uniquely identifies the Alertmanager cluster. + clusterLabel: "" + ## ForceEnableClusterMode ensures Alertmanager does not deactivate the cluster mode when running with a single replica. ## Use case is e.g. spanning an Alertmanager cluster across Kubernetes clusters with a single replica in each. forceEnableClusterMode: false