Merge branch 'foxlegend-feat/correlation'

worldline · Jul 2, 2024 · 6014cde · 6014cde
2 parents f338dd9 + 4f27899
commit 6014cde
Show file tree

Hide file tree

Showing 3 changed files with 393 additions and 60 deletions.
diff --git a/compose.yml b/compose.yml
@@ -266,6 +266,7 @@ services:
       - --web.enable-lifecycle
       - --web.enable-remote-write-receiver
       - --enable-feature=otlp-write-receiver
+      - --enable-feature=exemplar-storage
 
   tempo:
     image: grafana/tempo:latest
@@ -303,13 +304,6 @@ services:
           isDefault: true
           version: 1
           editable: true
-          jsonData:
-            derivedFields:
-              - datasourceUid: tempo
-                matcherRegex: 'trace_id'
-                matcherType: 'label'
-                name: TraceID
-                urlDisplayLabel: 'View Trace'
         - name: Prometheus
           type: prometheus
           uid: prometheus
@@ -320,11 +314,6 @@ services:
           isDefault: false
           version: 1
           editable: true
-          jsonData:
-            httpMethod: GET
-            exemplarTraceIdDestinations:
-              - datasourceUid: tempo
-                name: TraceID
         - name: Tempo
           type: tempo
           access: proxy
@@ -340,16 +329,6 @@ services:
             httpMethod: GET
             serviceMap:
               datasourceUid: prometheus
-            tracesToLogsV2:
-              datasourceUid: loki
-              filterBySpanID: false
-              filterByTraceID: true
-              tags:
-              - application
-            tracesToMetrics:
-              datasourceUid: prometheus
-              tags:
-              - application
         EOF
         /run.sh
     image: grafana/grafana:latest