From 0c610bb4967e37078c7712ad08fbf0b3bdc913a4 Mon Sep 17 00:00:00 2001
From: Chris Elias <chris.elias5@gmail.com>
Date: Mon, 11 Dec 2023 09:41:36 -0500
Subject: [PATCH 1/3] add tempo node graph to tempo datasource

---
 monitoring/grafana-datasource-tempo.yaml |  8 +++++++-
 monitoring/values-prom-operator.yaml     | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/monitoring/grafana-datasource-tempo.yaml b/monitoring/grafana-datasource-tempo.yaml
index 209206d6..7e26707d 100644
--- a/monitoring/grafana-datasource-tempo.yaml
+++ b/monitoring/grafana-datasource-tempo.yaml
@@ -11,5 +11,11 @@ grafana:
         url: http://v4m-tempo:3100
         isDefault: false
         editable: true
+        jsonData:
+          serviceMap:
+            datasourceUid: prometheus
+          nodeGraph:
+            enabled: true
+          # search:
+          #   hide: false
         apiVersion: 1
-
diff --git a/monitoring/values-prom-operator.yaml b/monitoring/values-prom-operator.yaml
index 1ac377d5..051dcc3d 100644
--- a/monitoring/values-prom-operator.yaml
+++ b/monitoring/values-prom-operator.yaml
@@ -237,3 +237,13 @@ grafana:
       - kubernetes.io/pvc-protection
     # subPath: ""
     # existingClaim:
+
+tempo: 
+  metricsGenerator:
+    enabled: true
+    config:
+      service_graphs_max_items: 15000
+
+  global_overrides:
+    metrics_generator_processors:
+      - service-graphs

From caab9aecb935ed4716767e8a5a9ac8b7e7424552 Mon Sep 17 00:00:00 2001
From: Chris Elias <chris.elias5@gmail.com>
Date: Mon, 11 Dec 2023 09:45:23 -0500
Subject: [PATCH 2/3] update changelog

---
 CHANGELOG.md                             | 3 +++
 monitoring/grafana-datasource-tempo.yaml | 2 --
 monitoring/values-prom-operator.yaml     | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 082411ad..dc8bb78b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,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
index 7e26707d..881cd1cd 100644
--- a/monitoring/grafana-datasource-tempo.yaml
+++ b/monitoring/grafana-datasource-tempo.yaml
@@ -16,6 +16,4 @@ grafana:
             datasourceUid: prometheus
           nodeGraph:
             enabled: true
-          # search:
-          #   hide: false
         apiVersion: 1
diff --git a/monitoring/values-prom-operator.yaml b/monitoring/values-prom-operator.yaml
index 051dcc3d..030f1b23 100644
--- a/monitoring/values-prom-operator.yaml
+++ b/monitoring/values-prom-operator.yaml
@@ -241,8 +241,6 @@ grafana:
 tempo: 
   metricsGenerator:
     enabled: true
-    config:
-      service_graphs_max_items: 15000
 
   global_overrides:
     metrics_generator_processors:

From 9e3de0f5fbe70521ab665e14897b5617777b6cdc Mon Sep 17 00:00:00 2001
From: Chris Elias <chris.elias5@gmail.com>
Date: Mon, 11 Dec 2023 11:25:01 -0500
Subject: [PATCH 3/3] move tempo values to tempo values file

---
 monitoring/values-prom-operator.yaml | 7 -------
 monitoring/values-tempo.yaml         | 8 ++++++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/monitoring/values-prom-operator.yaml b/monitoring/values-prom-operator.yaml
index 030f1b23..737b8535 100644
--- a/monitoring/values-prom-operator.yaml
+++ b/monitoring/values-prom-operator.yaml
@@ -238,10 +238,3 @@ grafana:
     # subPath: ""
     # existingClaim:
 
-tempo: 
-  metricsGenerator:
-    enabled: true
-
-  global_overrides:
-    metrics_generator_processors:
-      - service-graphs
diff --git a/monitoring/values-tempo.yaml b/monitoring/values-tempo.yaml
index 78640073..c0c351ec 100644
--- 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