From bc5cdadb9fff84a2fbf43e86cd7f43682df5b695 Mon Sep 17 00:00:00 2001
From: Michel Hollands <michel.hollands@gmail.com>
Date: Thu, 19 Oct 2023 10:28:59 +0100
Subject: [PATCH] Rename file and do not run ruler when no mimir

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
---
 .../{mimir-dahboards-5.yaml => mimir-dashboards-5.yaml}       | 0
 charts/meta-monitoring/templates/ruler/ruler.yaml             | 4 ++--
 charts/meta-monitoring/templates/ruler/rules-configmap.yaml   | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename charts/meta-monitoring/templates/grafana/{mimir-dahboards-5.yaml => mimir-dashboards-5.yaml} (100%)

diff --git a/charts/meta-monitoring/templates/grafana/mimir-dahboards-5.yaml b/charts/meta-monitoring/templates/grafana/mimir-dashboards-5.yaml
similarity index 100%
rename from charts/meta-monitoring/templates/grafana/mimir-dahboards-5.yaml
rename to charts/meta-monitoring/templates/grafana/mimir-dashboards-5.yaml
diff --git a/charts/meta-monitoring/templates/ruler/ruler.yaml b/charts/meta-monitoring/templates/ruler/ruler.yaml
index 2f805e3..99fafb8 100644
--- a/charts/meta-monitoring/templates/ruler/ruler.yaml
+++ b/charts/meta-monitoring/templates/ruler/ruler.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.local.metrics.enabled }}
 {{- if or (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled) .Values.dashboards.traces.enabled }}
 apiVersion: apps/v1
 kind: Deployment
@@ -91,8 +92,6 @@ spec:
         runAsUser: 10001
         seccompProfile:
           type: RuntimeDefault
-      serviceAccount: meta-mimir
-      serviceAccountName: meta-mimir
       terminationGracePeriodSeconds: 180
       topologySpreadConstraints:
         - labelSelector:
@@ -124,3 +123,4 @@ spec:
             name: rules
           name: rules
 {{- end }}
+{{- end }}
diff --git a/charts/meta-monitoring/templates/ruler/rules-configmap.yaml b/charts/meta-monitoring/templates/ruler/rules-configmap.yaml
index c3396ef..c2cb34a 100644
--- a/charts/meta-monitoring/templates/ruler/rules-configmap.yaml
+++ b/charts/meta-monitoring/templates/ruler/rules-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.local.metrics.enabled }}
 {{- if or (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled) .Values.dashboards.traces.enabled }}
 ---
 apiVersion: v1
@@ -16,3 +17,4 @@ data:
 {{ ($.Files.Glob "src/rules/tempo-rules.yaml").AsConfig | indent 2 }}
 {{- end }}
 {{- end }}
+{{- end }}