From 102d4c65137dc17a33d125cb384fc17d5cbc4c6e Mon Sep 17 00:00:00 2001 From: Simon Pasquier <spasquie@redhat.com> Date: Fri, 29 Jan 2021 15:57:14 +0100 Subject: [PATCH] Default alerting to Alertmanager API v2 Alertmanager API v2 is available for more than 2 years now, there's no reason to not use it by default. Signed-off-by: Simon Pasquier <spasquie@redhat.com> --- jsonnet/kube-prometheus/components/prometheus.libsonnet | 1 + manifests/prometheus-prometheus.yaml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index e93f8537..63d6d061 100644 --- a/jsonnet/kube-prometheus/components/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet @@ -251,6 +251,7 @@ function(params) { namespace: p.config.namespace, name: 'alertmanager-' + p.config.alertmanagerName, port: 'web', + apiVersion: 'v2', }], }, securityContext: { diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 36fd374f..f1f8ef2f 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -12,7 +12,8 @@ metadata: spec: alerting: alertmanagers: - - name: alertmanager-main + - apiVersion: v2 + name: alertmanager-main namespace: monitoring port: web image: quay.io/prometheus/prometheus:v2.24.0 -- GitLab