From 4f194ce720da895b093ac7304e35ceb2c2b142e3 Mon Sep 17 00:00:00 2001
From: Nik Afiq <nik.afiq98@ymail.com>
Date: Wed, 25 Mar 2026 21:55:09 +0900
Subject: [PATCH] move Tempo datasource to kube-prometheus-stack values, remove
 ConfigMap

---
 manifests/monitoring/tempo-datasource.yaml | 27 ----------------------
 values/kube-prometheus-stack.yaml          | 17 ++++++++++++++
 2 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 manifests/monitoring/tempo-datasource.yaml

diff --git a/manifests/monitoring/tempo-datasource.yaml b/manifests/monitoring/tempo-datasource.yaml
deleted file mode 100644
index 38703b4..0000000
--- a/manifests/monitoring/tempo-datasource.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: grafana-tempo-datasource
-  namespace: monitoring
-  labels:
-    grafana_datasource: "1"
-data:
-  tempo-datasource.yaml: |
-    apiVersion: 1
-    datasources:
-      - name: Tempo
-        type: tempo
-        access: proxy
-        url: http://tempo.monitoring.svc.cluster.local:3200
-        isDefault: false
-        jsonData:
-          tracesToLogsV2:
-            datasourceUid: loki
-            spanStartTimeShift: '-1m'
-            spanEndTimeShift: '1m'
-          serviceMap:
-            datasourceUid: prometheus
-          nodeGraph:
-            enabled: true
-          search:
-            hide: false
diff --git a/values/kube-prometheus-stack.yaml b/values/kube-prometheus-stack.yaml
index 4d34eaf..0cfb70b 100644
--- a/values/kube-prometheus-stack.yaml
+++ b/values/kube-prometheus-stack.yaml
@@ -50,6 +50,23 @@ grafana:
     runAsNonRoot: false
     runAsUser: 0
     fsGroup: 472
+  additionalDataSources:
+    - name: Tempo
+      type: tempo
+      access: proxy
+      url: http://tempo.monitoring.svc.cluster.local:3200
+      isDefault: false
+      jsonData:
+        tracesToLogsV2:
+          datasourceUid: loki
+          spanStartTimeShift: '-1m'
+          spanEndTimeShift: '1m'
+        serviceMap:
+          datasourceUid: prometheus
+        nodeGraph:
+          enabled: true
+        search:
+          hide: false
 
 prometheus:
   prometheusSpec: