[compose] Bump to tempo 2.6.0 && support Explore Traces

Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Sep 27, 2024 · ba89408 · ba89408
1 parent 94e41e4
commit ba89408
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 7 deletions.
diff --git a/compose.override.yaml b/compose.override.yaml
@@ -45,8 +45,8 @@ services:
       GF_DIAGNOSTICS_PROFILING_ADDR: 0.0.0.0
       GF_DIAGNOSTICS_PROFILING_PORT: 6060
       GF_FEATURE_TOGGLES_ENABLE: accessControlOnCall lokiLogsDataplane
-      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafana-lokiexplore-app, grafana-pyroscope-app
-      GF_INSTALL_PLUGINS: https://storage.googleapis.com/integration-artifacts/grafana-lokiexplore-app/grafana-lokiexplore-app-latest.zip;grafana-lokiexplore-app, grafana-pyroscope-app
+      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafana-lokiexplore-app, grafana-pyroscope-app, grafana-exploretraces-app
+      GF_INSTALL_PLUGINS: grafana-lokiexplore-app, grafana-pyroscope-app, grafana-exploretraces-app
 
   # override compose.yaml included service tempo's labels and environment to enabled profiles and traces data collection
   tempo:

diff --git a/docker-compose/common/compose-include/tempo.yaml b/docker-compose/common/compose-include/tempo.yaml
@@ -10,7 +10,7 @@ services:
     labels:
       metrics.grafana.com/scrape: false
     depends_on: { minio: { condition: service_healthy } }
-    image: ${TEMPO_IMAGE:-docker.io/grafana/tempo:2.5.0}
+    image: ${TEMPO_IMAGE:-docker.io/grafana/tempo:2.6.0}
     configs:
       - source: tempo_config_file
         target: /etc/tempo/config.yaml

diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env
@@ -1,7 +1,7 @@
 ALLOY_IMAGE=grafana/alloy:v1.3.1
 LOKI_IMAGE=grafana/loki:3.1.1
 GRAFANA_IMAGE=grafana/grafana:11.2.0
-TEMPO_IMAGE=grafana/tempo:2.5.0
+TEMPO_IMAGE=grafana/tempo:2.6.0
 MIMIR_IMAGE=grafana/mimir-alpine:2.13.0
 MIMIRTOOL_IMAGE=grafana/mimirtool:2.13.0
 PYROSCOPE_IMAGE=grafana/pyroscope:1.8.0

diff --git a/docker-compose/common/config/tempo/microservices-mode-traces.yaml b/docker-compose/common/config/tempo/microservices-mode-traces.yaml
@@ -62,6 +62,8 @@ metrics_generator:
       send_native_histograms: true
       headers:
         X-Scope-OrgID: "anonymous"
+  traces_storage:
+    path: /tmp/tempo/generator/traces
 
 server:
   http_listen_port: 3200
@@ -105,3 +107,4 @@ overrides:
       processors:
       - service-graphs
       - span-metrics
+      - local-blocks
diff --git a/docker-compose/common/config/tempo/monolithic-mode-traces.yaml b/docker-compose/common/config/tempo/monolithic-mode-traces.yaml
@@ -55,11 +55,13 @@ metrics_generator:
     path: /tmp/tempo/generator/wal
     remote_write_add_org_id_header: true
     remote_write:
-    - url: http://mimir:8080/api/v1/push
+    - url: http://gateway:8080/api/v1/push
       send_exemplars: true
       send_native_histograms: true
       headers:
         X-Scope-OrgID: "anonymous"
+  traces_storage:
+    path: /tmp/tempo/generator/traces
 
 storage:
   trace:
@@ -97,3 +99,4 @@ overrides:
       processors:
       - service-graphs
       - span-metrics
+      - local-blocks
diff --git a/docker-compose/microservices-mode/traces/compose.yaml b/docker-compose/microservices-mode/traces/compose.yaml
@@ -65,7 +65,7 @@ services:
 
   distributor:
     depends_on: { ingester: { condition: service_healthy } }
-    image: &tempoImage ${TEMPO_IMAGE:-docker.io/grafana/tempo:2.5.0}
+    image: &tempoImage ${TEMPO_IMAGE:-docker.io/grafana/tempo:2.6.0}
     configs:
       - source: tempo_config_file
         target: /etc/tempo/config.yaml

diff --git a/docker-compose/monolithic-mode/all-in-one/compose.yaml b/docker-compose/monolithic-mode/all-in-one/compose.yaml
@@ -98,7 +98,7 @@ services:
       metrics.grafana.com/scrape: false
       profiles.grafana.com/service_name: tempo
     depends_on: { minio: { condition: service_healthy }, mimir: { condition: service_healthy } }
-    image: ${TEMPO_IMAGE:-docker.io/grafana/tempo:2.5.0}
+    image: ${TEMPO_IMAGE:-docker.io/grafana/tempo:2.6.0}
     configs:
       - source: tempo_config_file
         target: /etc/tempo/config.yaml

diff --git a/kubernetes/microservices-mode/traces/configs/tempo-distributed.yaml b/kubernetes/microservices-mode/traces/configs/tempo-distributed.yaml
@@ -73,6 +73,8 @@ metrics_generator:
       send_native_histograms: true
       headers:
         X-Scope-OrgID: "anonymous"
+  traces_storage:
+    path: /var/tempo/generator/traces
 
 server:
   http_listen_port: 3100
@@ -115,3 +117,4 @@ overrides:
       processors:
       - service-graphs
       - span-metrics
+      - local-blocks
diff --git a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml
@@ -5024,6 +5024,8 @@ data:
           send_native_histograms: true
           headers:
             X-Scope-OrgID: "anonymous"
+      traces_storage:
+        path: /var/tempo/generator/traces
 
     server:
       http_listen_port: 3100
@@ -5066,6 +5068,7 @@ data:
           processors:
           - service-graphs
           - span-metrics
+          - local-blocks
 kind: ConfigMap
 metadata:
   labels:

diff --git a/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml
@@ -5423,6 +5423,8 @@ data:
           send_native_histograms: true
           headers:
             X-Scope-OrgID: "anonymous"
+      traces_storage:
+        path: /tmp/tempo/generator/traces
 
     server:
       http_listen_port: 3100
@@ -5465,6 +5467,7 @@ data:
           processors:
           - service-graphs
           - span-metrics
+          - local-blocks
 kind: ConfigMap
 metadata:
   labels:

diff --git a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml
@@ -5028,6 +5028,8 @@ data:
           send_native_histograms: true
           headers:
             X-Scope-OrgID: "anonymous"
+      traces_storage:
+        path: /tmp/tempo/generator/traces
 
     server:
       http_listen_port: 3100
@@ -5070,6 +5072,7 @@ data:
           processors:
           - service-graphs
           - span-metrics
+          - local-blocks
 kind: ConfigMap
 metadata:
   labels:

diff --git a/kubernetes/monolithic-mode/traces/tempo/configs/tempo.yaml b/kubernetes/monolithic-mode/traces/tempo/configs/tempo.yaml
@@ -55,6 +55,8 @@ metrics_generator:
       send_native_histograms: true
       headers:
         X-Scope-OrgID: "anonymous"
+  traces_storage:
+    path: /tmp/tempo/generator/traces
 
 server:
   http_listen_port: 3100
@@ -97,3 +99,4 @@ overrides:
       processors:
       - service-graphs
       - span-metrics
+      - local-blocks