From 52ec526718567f15ecc5ae228de830523b55c79f Mon Sep 17 00:00:00 2001
From: Michel Hollands <michel.hollands@gmail.com>
Date: Wed, 8 May 2024 10:24:48 +0100
Subject: [PATCH] Remove unused variables

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
---
 .../templates/grafana/agent-dashboards-1.yaml             | 2 +-
 charts/meta-monitoring/templates/grafana/dashboard.yaml   | 2 +-
 charts/meta-monitoring/templates/grafana/grafana.yaml     | 2 +-
 charts/meta-monitoring/templates/ruler/ruler.yaml         | 2 +-
 .../meta-monitoring/templates/ruler/rules-configmap.yaml  | 8 +-------
 charts/meta-monitoring/values.yaml                        | 4 ----
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/charts/meta-monitoring/templates/grafana/agent-dashboards-1.yaml b/charts/meta-monitoring/templates/grafana/agent-dashboards-1.yaml
index b0aa4c1..6ab2f2b 100644
--- a/charts/meta-monitoring/templates/grafana/agent-dashboards-1.yaml
+++ b/charts/meta-monitoring/templates/grafana/agent-dashboards-1.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.local.grafana.enabled (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled .Values.dashboards.traces.enabled) }}
+{{- if and .Values.local.grafana.enabled .Values.dashboards.logs.enabled }}
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/charts/meta-monitoring/templates/grafana/dashboard.yaml b/charts/meta-monitoring/templates/grafana/dashboard.yaml
index aa63bf3..36ce80d 100644
--- a/charts/meta-monitoring/templates/grafana/dashboard.yaml
+++ b/charts/meta-monitoring/templates/grafana/dashboard.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.local.grafana.enabled (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled .Values.dashboards.traces.enabled) }}
+{{- if and .Values.local.grafana.enabled .Values.dashboards.logs.enabled }}
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/charts/meta-monitoring/templates/grafana/grafana.yaml b/charts/meta-monitoring/templates/grafana/grafana.yaml
index 4fe45a2..0a2f68f 100644
--- a/charts/meta-monitoring/templates/grafana/grafana.yaml
+++ b/charts/meta-monitoring/templates/grafana/grafana.yaml
@@ -65,7 +65,7 @@ spec:
               name: grafana-pv
             - mountPath: /etc/grafana/provisioning/datasources
               name: datasources-provisioning
-            {{- if or (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled) .Values.dashboards.traces.enabled }}
+            {{- if .Values.dashboards.logs.enabled }}
             - mountPath: /etc/grafana/provisioning/dashboards
               name: dashboards-provisioning
             {{- end }}
diff --git a/charts/meta-monitoring/templates/ruler/ruler.yaml b/charts/meta-monitoring/templates/ruler/ruler.yaml
index 090267c..215e29d 100644
--- a/charts/meta-monitoring/templates/ruler/ruler.yaml
+++ b/charts/meta-monitoring/templates/ruler/ruler.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.local.grafana.enabled }}
-{{- if and .Values.local.grafana.enabled (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled .Values.dashboards.traces.enabled) }}
+{{- if and .Values.local.grafana.enabled .Values.dashboards.logs.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/charts/meta-monitoring/templates/ruler/rules-configmap.yaml b/charts/meta-monitoring/templates/ruler/rules-configmap.yaml
index 6d253c8..272aa15 100644
--- a/charts/meta-monitoring/templates/ruler/rules-configmap.yaml
+++ b/charts/meta-monitoring/templates/ruler/rules-configmap.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.local.metrics.enabled }}
-{{- if and .Values.local.grafana.enabled (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled .Values.dashboards.traces.enabled) }}
+{{- if and .Values.local.grafana.enabled .Values.dashboards.logs.enabled }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -10,11 +10,5 @@ data:
 {{- if .Values.dashboards.logs.enabled }}
 {{ ($.Files.Glob "src/rules/loki-rules.yaml").AsConfig | indent 2 }}
 {{- end }}
-{{- if .Values.dashboards.metrics.enabled }}
-{{ ($.Files.Glob "src/rules/mimir-rules.yaml").AsConfig | indent 2 }}
-{{- end }}
-{{- if .Values.dashboards.traces.enabled }}
-{{ ($.Files.Glob "src/rules/tempo-rules.yaml").AsConfig | indent 2 }}
-{{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml
index 72ca259..476cbb6 100644
--- a/charts/meta-monitoring/values.yaml
+++ b/charts/meta-monitoring/values.yaml
@@ -176,10 +176,6 @@ metrics:
 dashboards:
   logs:
     enabled: true
-  metrics:
-    enabled: true
-  traces:
-    enabled: true
 kubeStateMetrics:
   # Scrape https://github.com/kubernetes/kube-state-metrics by default
   enabled: true