From 2f302943fe96b5aaf474fe3ae5fab20330e8f0a1 Mon Sep 17 00:00:00 2001
From: Max Leonard Inden <IndenML@gmail.com>
Date: Mon, 19 Mar 2018 14:19:55 +0100
Subject: [PATCH] Unify rule file label accross repository
In some cases we have been using `alert-rules` in some cases
`prometheus-rulefiles`. This led to confusion [1]. Instead, unify the
Prometheus rules configmap labels to:
```yaml
labels:
role: alert-rules
```
[1] https://github.com/coreos/prometheus-operator/issues/1102
---
hack/scripts/generate-rules-configmap.sh | 2 +-
manifests/prometheus/prometheus-k8s-rules.yaml | 2 +-
manifests/prometheus/prometheus-k8s.yaml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hack/scripts/generate-rules-configmap.sh b/hack/scripts/generate-rules-configmap.sh
index 76ec64ca..96c5433f 100755
--- a/hack/scripts/generate-rules-configmap.sh
+++ b/hack/scripts/generate-rules-configmap.sh
@@ -6,7 +6,7 @@ kind: ConfigMap
metadata:
name: prometheus-k8s-rules
labels:
- role: prometheus-rulefiles
+ role: alert-rules
prometheus: k8s
data:
EOF
diff --git a/manifests/prometheus/prometheus-k8s-rules.yaml b/manifests/prometheus/prometheus-k8s-rules.yaml
index 05368dc1..0e548cec 100644
--- a/manifests/prometheus/prometheus-k8s-rules.yaml
+++ b/manifests/prometheus/prometheus-k8s-rules.yaml
@@ -3,7 +3,7 @@ kind: ConfigMap
metadata:
name: prometheus-k8s-rules
labels:
- role: prometheus-rulefiles
+ role: alert-rules
prometheus: k8s
data:
alertmanager.rules.yaml: |+
diff --git a/manifests/prometheus/prometheus-k8s.yaml b/manifests/prometheus/prometheus-k8s.yaml
index 6ce11e9f..8f243eb0 100644
--- a/manifests/prometheus/prometheus-k8s.yaml
+++ b/manifests/prometheus/prometheus-k8s.yaml
@@ -13,7 +13,7 @@ spec:
- {key: k8s-app, operator: Exists}
ruleSelector:
matchLabels:
- role: prometheus-rulefiles
+ role: alert-rules
prometheus: k8s
resources:
requests:
--
GitLab