Merge pull request #746 from moritazy/main

[grafana] Fix missing sidecar dashboard label on configmap
grafana · Oct 19, 2021 · e67ee4b · e67ee4b
2 parents 4cfc09d + ca56492
commit e67ee4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 6.17.1
+version: 6.17.2
 appVersion: 8.2.1
 kubeVersion: '^1.8.0-0'
 description: The leading tool for querying and visualizing time series and metrics.

diff --git a/charts/grafana/templates/dashboards-json-configmap.yaml b/charts/grafana/templates/dashboards-json-configmap.yaml
@@ -9,6 +9,9 @@ metadata:
   labels:
     {{- include "grafana.labels" $ | nindent 4 }}
     dashboard-provider: {{ $provider }}
+    {{- if $.Values.sidecar.dashboards.label }}
+    {{ $.Values.sidecar.dashboards.label }}: "1"
+    {{- end }}
 {{- if $dashboards }}
 data:
 {{- $dashboardFound := false }}