From 845e977c89499126e84a75c232d428368f41cfbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kr=C4=8Dma?= Date: Thu, 15 Nov 2018 17:02:33 +0100 Subject: [PATCH] [stable/rabbitmq-ha] Fix namespace and labels in prometheus alerts definition (#7520) Signed-off-by: Jakub Krcma --- stable/rabbitmq-ha/Chart.yaml | 2 +- stable/rabbitmq-ha/templates/alerts.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml index 6558828753..153f7421f2 100644 --- a/stable/rabbitmq-ha/Chart.yaml +++ b/stable/rabbitmq-ha/Chart.yaml @@ -1,7 +1,7 @@ name: rabbitmq-ha apiVersion: v1 appVersion: 3.7.4 -version: 1.12.1 +version: 1.13.0 description: Highly available RabbitMQ cluster, the open source message broker software that implements the Advanced Message Queuing Protocol (AMQP). keywords: diff --git a/stable/rabbitmq-ha/templates/alerts.yaml b/stable/rabbitmq-ha/templates/alerts.yaml index 79ad27d3ae..20b4f3bb9c 100644 --- a/stable/rabbitmq-ha/templates/alerts.yaml +++ b/stable/rabbitmq-ha/templates/alerts.yaml @@ -3,12 +3,12 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .Release.Name }}-rabbitmq-alerts - namespace: monitoring + namespace: {{ .Values.prometheus.operator.serviceMonitor.namespace }} labels: - app: "rabbitmq" - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - heritage: {{ .Release.Service }} + app: {{ template "rabbitmq-ha.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} + heritage: {{ .Release.Service }} {{- if .Values.prometheus.operator.serviceMonitor.selector }} {{ toYaml .Values.prometheus.operator.serviceMonitor.selector | indent 4 }} {{- end }}