Merge pull request #590 from sassoftware/tempo-node-graph

Tempo node graph
sassoftware · Dec 12, 2023 · 26d9032 · 26d9032
2 parents 3f653dd + 9e3de0f
commit 26d9032
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,9 @@
   * [REMOVAL] Removed the deprecated, experimental, script getlogs.sh from repo.  The Python-based getlogs.py script should be used instead.
   * [FIX] Corrected bug in change_internal_password.sh that prevented it from working
 
+* **Tracing**
+  * [FEATURE] Added node graph feature to Tempo data source in Grafana for more visualization options
+
 ## Version 1.2.19 (14NOV2023)
 
 * **Overall**

diff --git a/monitoring/grafana-datasource-tempo.yaml b/monitoring/grafana-datasource-tempo.yaml
@@ -11,5 +11,9 @@ grafana:
         url: http://v4m-tempo:3100
         isDefault: false
         editable: true
+        jsonData:
+          serviceMap:
+            datasourceUid: prometheus
+          nodeGraph:
+            enabled: true
         apiVersion: 1
-
diff --git a/monitoring/values-prom-operator.yaml b/monitoring/values-prom-operator.yaml
@@ -237,3 +237,4 @@ grafana:
       - kubernetes.io/pvc-protection
     # subPath: ""
     # existingClaim:
+
diff --git a/monitoring/values-tempo.yaml b/monitoring/values-tempo.yaml
@@ -13,8 +13,12 @@ tempo:
   reportingEnabled: false
   metricsGenerator:
     # -- If true, enables Tempo's metrics generator (https://grafana.com/docs/tempo/next/metrics-generator/)
-    enabled: false
-    remoteWriteUrl: "http://prometheus.monitoring:9090/api/v1/write"
+    enabled: true
+    remoteWriteUrl: "http://v4m-prometheus.monitoring:9090/api/v1/write"
+
+  # global_overrides:
+  #   metrics_generator_processors:
+  #     - service-graphs
 
   retention: 24h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -237,3 +237,4 @@ grafana:
		- kubernetes.io/pvc-protection
		# subPath: ""
		# existingClaim: