Skip to content
This repository has been archived by the owner on Dec 4, 2024. It is now read-only.

[prometheus] bump to chart containing elasticsearch alertmanager rules #1209

Merged
merged 4 commits into from
Jun 21, 2021
Merged

[prometheus] bump to chart containing elasticsearch alertmanager rules #1209

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
524f7a8
[prometheus] bump prometheus to allow creationg of elasticsearch rules
alejandroEsc Jun 11, 2021
13366a8
change to correct version
alejandroEsc Jun 15, 2021
bbb26ab
update revision version
alejandroEsc Jun 15, 2021
b357334
permalink to raw values file update
alejandroEsc Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions addons/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand All @@ -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"
Expand All @@ -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:
Expand Down