From 7afc6aa515db4a43ce8dc1a152f45f400fc68a39 Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Thu, 28 Sep 2023 09:08:26 +0930
Subject: [PATCH] feat(prometheus): rule selector configurable from values.yaml

!4
---
 templates/Prometheus-prometheus.yaml | 1 -
 templates/PrometheusRule-thanos.yaml | 2 +-
 values.yaml                          | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/Prometheus-prometheus.yaml b/templates/Prometheus-prometheus.yaml
index 7fa909e..3b371fa 100644
--- a/templates/Prometheus-prometheus.yaml
+++ b/templates/Prometheus-prometheus.yaml
@@ -41,7 +41,6 @@ spec:
     requests:
       memory: 400Mi
   ruleNamespaceSelector: {}
-  ruleSelector: {}
   securityContext:
     fsGroup: 2000
     runAsNonRoot: true
diff --git a/templates/PrometheusRule-thanos.yaml b/templates/PrometheusRule-thanos.yaml
index 94a1402..2103d24 100644
--- a/templates/PrometheusRule-thanos.yaml
+++ b/templates/PrometheusRule-thanos.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/version: {{  $.Chart.Version }}
     prometheus: k8s
     role: alert-rules
-  name: thanos-rules
+  name: thanos-sidecar-rules
   namespace: {{  .Values.nfc_monitoring.prometheus.namespace }}
 spec:
   groups:
diff --git a/values.yaml b/values.yaml
index f48c99a..57faf2c 100644
--- a/values.yaml
+++ b/values.yaml
@@ -240,6 +240,9 @@ nfc_monitoring:
 
       retention: 24h
       retentionSize: 20GB
+      ruleSelector:
+        matchLabels:
+          role: alert-rules
 
 
   prometheus_adaptor: