From f039fc94cff7156b4476988e2befd47968e8519e Mon Sep 17 00:00:00 2001
From: Maxime Brunet <maxime.brunet@paytm.com>
Date: Fri, 19 Feb 2021 15:08:35 -0800
Subject: [PATCH] Ensure Prometheus ServiceMonitor is unique
---
jsonnet/kube-prometheus/components/prometheus.libsonnet | 2 +-
manifests/prometheus-serviceMonitor.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet
index f3cbe07d..58b8e517 100644
--- a/jsonnet/kube-prometheus/components/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet
@@ -282,7 +282,7 @@ function(params) {
apiVersion: 'monitoring.coreos.com/v1',
kind: 'ServiceMonitor',
metadata: {
- name: 'prometheus',
+ name: 'prometheus-' + p.config.name,
namespace: p.config.namespace,
labels: p.config.commonLabels,
},
diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml
index a36e3941..1d91cbc2 100644
--- a/manifests/prometheus-serviceMonitor.yaml
+++ b/manifests/prometheus-serviceMonitor.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 2.24.0
- name: prometheus
+ name: prometheus-k8s
namespace: monitoring
spec:
endpoints:
--
GitLab