From f6d9a115de8022c3c1b734a9c2908974ca6b3c7a Mon Sep 17 00:00:00 2001
From: Nerav Doshi <103272684+nedoshi@users.noreply.github.com>
Date: Fri, 17 Apr 2026 14:11:53 -0400
Subject: [PATCH 1/2] Squashed commit

---
 charts/rosa-thanos-s3/Chart.yaml                              | 2 +-
 charts/rosa-thanos-s3/templates/grafana/dashboards.yaml       | 3 ++-
 .../rosa-thanos-s3/templates/grafana/grafanadatasource.yaml   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/charts/rosa-thanos-s3/Chart.yaml b/charts/rosa-thanos-s3/Chart.yaml
index 0fd95a7..5aaef06 100644
--- a/charts/rosa-thanos-s3/Chart.yaml
+++ b/charts/rosa-thanos-s3/Chart.yaml
@@ -8,7 +8,7 @@ version: 0.3.0
 
 dependencies:
   - name: grafana-cr
-    version: "0.5.0"
+    version: "0.5.6"
     repository: "https://rh-mobb.github.io/helm-charts/"
     # repository: file://../grafana-cr
   - name: alloy
diff --git a/charts/rosa-thanos-s3/templates/grafana/dashboards.yaml b/charts/rosa-thanos-s3/templates/grafana/dashboards.yaml
index 74c230e..e4878fc 100644
--- a/charts/rosa-thanos-s3/templates/grafana/dashboards.yaml
+++ b/charts/rosa-thanos-s3/templates/grafana/dashboards.yaml
@@ -9,6 +9,7 @@ metadata:
 spec:
   instanceSelector:
     matchLabels:
-      dashboards: "grafana"
+      app.kubernetes.io/name: grafana-cr
+      app.kubernetes.io/instance: {{ $.Release.Name }}
   json: {{ $.Files.Get $path }}
 {{ end }}
diff --git a/charts/rosa-thanos-s3/templates/grafana/grafanadatasource.yaml b/charts/rosa-thanos-s3/templates/grafana/grafanadatasource.yaml
index 610780b..7196c0d 100644
--- a/charts/rosa-thanos-s3/templates/grafana/grafanadatasource.yaml
+++ b/charts/rosa-thanos-s3/templates/grafana/grafanadatasource.yaml
@@ -5,10 +5,10 @@ metadata:
   labels:
     {{- include "rosa-thanos-s3.labels" . | nindent 4 }}
 spec:
-  name: {{ include "rosa-thanos-s3.fullname" . }}.yaml
   instanceSelector:
     matchLabels:
-      dashboards: grafana
+      app.kubernetes.io/name: grafana-cr
+      app.kubernetes.io/instance: {{ .Release.Name }}
   datasource:
     name: prometheus
     access: proxy

From 3d6e11c4388c68c2464fbb1de6f84f6271efe934 Mon Sep 17 00:00:00 2001
From: Nerav Doshi <103272684+nedoshi@users.noreply.github.com>
Date: Fri, 17 Apr 2026 14:27:02 -0400
Subject: [PATCH 2/2] changed rosa thanos chart version

---
 charts/rosa-thanos-s3/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/rosa-thanos-s3/Chart.yaml b/charts/rosa-thanos-s3/Chart.yaml
index 5aaef06..7fbed5f 100644
--- a/charts/rosa-thanos-s3/Chart.yaml
+++ b/charts/rosa-thanos-s3/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for Kubernetes
 
 type: application
 
-version: 0.3.0
+version: 0.3.1
 
 dependencies:
   - name: grafana-cr