From cff8fec592a379df867473b42b14cf4cc7e0cbe7 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Fri, 12 Feb 2021 09:40:14 +0100 Subject: [PATCH 1/2] jsonnet: better name for prometheus PrometheusRule object --- jsonnet/kube-prometheus/components/prometheus.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index aef2a851..cef55f39 100644 --- a/jsonnet/kube-prometheus/components/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet @@ -66,7 +66,7 @@ function(params) { kind: 'PrometheusRule', metadata: { labels: p.config.commonLabels + p.config.mixin.ruleLabels, - name: p.config.name + '-rules', + name: 'prometheus-' + p.config.name + '-prometheus-rules', namespace: p.config.namespace, }, spec: { From 0fbf8e03e05425cb83a182cbbf5d28168bffecc7 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Fri, 12 Feb 2021 09:40:22 +0100 Subject: [PATCH 2/2] manifests: regenerate --- manifests/prometheus-prometheusRule.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml index d4d2ed68..7329eab4 100644 --- a/manifests/prometheus-prometheusRule.yaml +++ b/manifests/prometheus-prometheusRule.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/version: 2.24.0 prometheus: k8s role: alert-rules - name: k8s-rules + name: prometheus-k8s-prometheus-rules namespace: monitoring spec: groups: