easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #956 from PaytmLabs/feature/prometheus/unique-servicemonitor

Browse Source 
Ensure Prometheus ServiceMonitor is unique
This commit is contained in:
Paweł Krupa
2021-02-22 08:39:47 +01:00
committed by GitHub
parent d909241c4a f039fc94cf
commit bc1026ae2b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsonnet/kube-prometheus/components/prometheus.libsonnet
View File

@@ -282,7 +282,7 @@ function(params) {
apiVersion: 'monitoring.coreos.com/v1', apiVersion: 'monitoring.coreos.com/v1',
kind: 'ServiceMonitor', kind: 'ServiceMonitor',
metadata: { metadata: {
name: 'prometheus', name: 'prometheus-' + p.config.name,
namespace: p.config.namespace, namespace: p.config.namespace,
labels: p.config.commonLabels, labels: p.config.commonLabels,
}, },

2
manifests/prometheus-serviceMonitor.yaml
View File

@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/name: prometheus app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 2.24.0 app.kubernetes.io/version: 2.24.0
name: prometheus name: prometheus-k8s
namespace: monitoring namespace: monitoring
spec: spec:
endpoints: endpoints: