From a485e04bcbb877c87de0de357f3d3d534b4b9c41 Mon Sep 17 00:00:00 2001 From: mesosphere-mergebot Date: Mon, 21 Jun 2021 23:28:01 +0200 Subject: [PATCH] [release/4][BACKPORT] [prometheus] bump to chart containing elasticsearch alertmanager rules (#1224) * [prometheus] bump prometheus to allow creationg of elasticsearch rules * change to correct version * update revision version * permalink to raw values file update Co-authored-by: alejandroEsc --- addons/prometheus/prometheus.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/prometheus/prometheus.yaml b/addons/prometheus/prometheus.yaml index 8797812e..1cc677d4 100644 --- a/addons/prometheus/prometheus.yaml +++ b/addons/prometheus/prometheus.yaml @@ -9,7 +9,7 @@ metadata: # on the cluster, this hack will trigger re-queue on Addons until one exists. kubeaddons.mesosphere.io/hack-requires-defaultstorageclass: "true" annotations: - catalog.kubeaddons.mesosphere.io/addon-revision: "0.47.0-3" + catalog.kubeaddons.mesosphere.io/addon-revision: "0.47.0-4" appversion.kubeaddons.mesosphere.io/prometheus-operator: "0.47.0" appversion.kubeaddons.mesosphere.io/prometheus: "2.26.0" appversion.kubeaddons.mesosphere.io/alertmanager: "0.21.0" @@ -20,7 +20,7 @@ metadata: docs.kubeaddons.mesosphere.io/prometheus: "https://prometheus.io/docs/introduction/overview/" docs.kubeaddons.mesosphere.io/grafana: "https://grafana.com/docs/" docs.kubeaddons.mesosphere.io/alertmanager: "https://prometheus.io/docs/alerting/alertmanager/" - values.chart.helm.kubeaddons.mesosphere.io/prometheus: "https://raw.githubusercontent.com/mesosphere/charts/64e5c540ec8273cc7135babfde94a57495bbc52b/staging/prometheus-operator/values.yaml" + values.chart.helm.kubeaddons.mesosphere.io/prometheus: "https://raw.githubusercontent.com/mesosphere/charts/c0ec6852189730af8fb34ed2a62b1b79a959bfc5/staging/kube-prometheus-stack/values.yaml" # The prometheus-operator chart from prior Konvoy releases can't be upgraded to 8.10.0. # See https://github.com/helm/charts/issues/21200. # 8.8.5 was the latest version available in mesosphere/charts before it was bumped past 8.10.0. @@ -45,7 +45,7 @@ spec: chartReference: chart: kube-prometheus-stack repo: https://mesosphere.github.io/charts/staging - version: 15.4.5 + version: 15.4.7 valuesRemap: "prometheus.ingress.annotations.traefik\\.ingress\\.kubernetes\\.io/auth-url": "ingress.auth.auth-url" "alertmanager.ingress.annotations.traefik\\.ingress\\.kubernetes\\.io/auth-url": "ingress.auth.auth-url" @@ -59,6 +59,7 @@ spec: rules: # addon alert rules are defaulted to false to prevent potential misfires if addons # are disabled. + elasticsearch: false velero: false prometheus: ingress: