From be8342a7288efc4a206970786c22e4ac1e7079b3 Mon Sep 17 00:00:00 2001
From: Benjamin Herbert <benjamin@herbert.cc>
Date: Thu, 5 Oct 2023 11:11:42 +0200
Subject: [PATCH 1/3] [grafana] Upgrade grafana to 10.1.4

Signed-off-by: Benjamin Herbert <benjamin@herbert.cc>
---
 charts/grafana/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index d8687cce6d..2646cdadaf 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: grafana
-version: 6.60.2
-appVersion: 10.1.2
+version: 6.60.3
+appVersion: 10.1.4
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.net

From 6c4868c7ce3d74f81989e16ff391229c0b45f830 Mon Sep 17 00:00:00 2001
From: Chris Werner Rau <cwrau@cwrau.info>
Date: Fri, 6 Oct 2023 14:45:09 +0200
Subject: [PATCH 2/3] fix(grafana): add missing `| quote` for
 `sidecar.dashboards.labelValue`

Signed-off-by: Chris Werner Rau <cwrau@cwrau.info>
---
 charts/grafana/templates/dashboards-json-configmap.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/grafana/templates/dashboards-json-configmap.yaml b/charts/grafana/templates/dashboards-json-configmap.yaml
index 5a38338f8e..b96ce72026 100644
--- a/charts/grafana/templates/dashboards-json-configmap.yaml
+++ b/charts/grafana/templates/dashboards-json-configmap.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- include "grafana.labels" $ | nindent 4 }}
     dashboard-provider: {{ $provider }}
     {{- if $.Values.sidecar.dashboards.enabled }}
-    {{ $.Values.sidecar.dashboards.label }}: {{ $.Values.sidecar.dashboards.labelValue }}
+    {{ $.Values.sidecar.dashboards.label }}: {{ $.Values.sidecar.dashboards.labelValue | quote }}
     {{- end }}
 {{- if $dashboards }}
 data:

From 68adbe26358b05e1800f9e3bde5c16434464f5c8 Mon Sep 17 00:00:00 2001
From: Chris Werner Rau <cwrau@cwrau.info>
Date: Mon, 9 Oct 2023 10:30:58 +0200
Subject: [PATCH 3/3] chore(grafana): bump version

Signed-off-by: Chris Werner Rau <cwrau@cwrau.info>
---
 charts/grafana/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index 2646cdadaf..d80196048e 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 6.60.3
+version: 6.60.4
 appVersion: 10.1.4
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.