move Tempo datasource to kube-prometheus-stack values, remove ConfigMap

manifests/monitoring/tempo-datasource.yaml

@@ -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

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: