tempo: upgrade to v2

Signed-off-by: Victor Login <batazor@evrone.com>
shortlink-org · Feb 1, 2023 · 020c7e1 · 020c7e1
1 parent 856c23b
commit 020c7e1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/ops/Makefile/common.mk b/ops/Makefile/common.mk
@@ -27,10 +27,8 @@ dev: ## Run for development mode
 	@COMPOSE_PROFILES=dns,observability,gateway docker compose \
 		-f docker-compose.yaml \
 		-f ops/docker-compose/tooling/services/coredns/coredns.yaml \
-		-f ops/docker-compose/database/postgres/postgres.yaml \
-		-f ops/docker-compose/application/auth/keycloak/keycloak.yaml \
 		-f ops/docker-compose/tooling/observability/grafana/grafana.yaml \
-		-f ops/docker-compose/tooling/observability/prometheus/prometheus.yaml \
+		-f ops/docker-compose/tooling/observability/grafana/grafana-tempo.yaml \
 		up -d --remove-orphans --build
 
 run: ## Run this project in docker compose

diff --git a/ops/docker-compose/tooling/observability/grafana/conf/tempo/tempo-local.yaml b/ops/docker-compose/tooling/observability/grafana/conf/tempo/tempo-local.yaml
@@ -20,8 +20,8 @@ distributor:
 
 ingester:
   trace_idle_period: 10s               # the length of time after a trace has not received spans to consider it complete and flush it
-  max_block_bytes: 1_000_000           # cut the head block when it hits this size or ...
-  max_block_duration: 5m               #   this much time passes
+  max_block_bytes: 500_000_000         # cut the head block when it hits this size or ...
+  max_block_duration: 30m              # this much time passes
 
 querier:
   max_concurrent_queries: 100
@@ -45,10 +45,10 @@ storage:
   trace:
     backend: local                     # backend configuration to use
     block:
-      version: vParquet                # version of the block storage to use
+      version: v2                      # version of the block storage to use
       bloom_filter_false_positive: .05 # bloom filter false positive rate.  lower values create larger filters but fewer false positives
-      index_downsample_bytes: 1000     # number of bytes per index record
-      encoding: zstd                   # block encoding/compression.  options: none, gzip, lz4-64k, lz4-256k, lz4-1M, lz4, snappy, zstd
+      v2_index_downsample_bytes: 1000  # number of bytes per index record
+      v2_encoding: zstd                # block encoding/compression.  options: none, gzip, lz4-64k, lz4-256k, lz4-1M, lz4, snappy, zstd
     wal:
       path: /tmp/tempo/wal             # where to store the the wal locally
     local:

diff --git a/ops/docker-compose/tooling/observability/grafana/grafana-tempo.yaml b/ops/docker-compose/tooling/observability/grafana/grafana-tempo.yaml
@@ -13,7 +13,7 @@ services:
     <<: *network
     depends_on:
       - coredns
-    image: grafana/tempo:1.5.0
+    image: grafana/tempo:2.0.0
     profiles:
       - observability
     command: ["-config.file=/etc/tempo.yaml"]
@@ -27,20 +27,20 @@ services:
       - "9411"          # Zipkin
       - "3100"          # tempo
     volumes:
-      - ./ops/docker-compose/tooling/observability/tempo/tempo-local.yaml:/etc/tempo.yaml
+      - ./ops/docker-compose/tooling/observability/grafana/conf/tempo/tempo-local.yaml:/etc/tempo.yaml
       - $HOME/data/tempo:/tmp/tempo
 
   jaeger-query:
     <<: *network
     depends_on:
       - coredns
       - jaeger-agent
-    image: grafana/tempo-query:1.5.0
+    image: grafana/tempo-query:2.0.0
     profiles:
       - observability
     command: ["--grpc-storage-plugin.configuration-file=/etc/tempo-query.yaml"]
     container_name: jaeger-query
     ports:
       - "16686:16686"  # jaeger-ui
     volumes:
-      - ./ops/docker-compose/tooling/observability/tempo/tempo-query.yaml:/etc/tempo-query.yaml
+      - ./ops/docker-compose/tooling/observability/grafana/conf/tempo/tempo-query.yaml:/etc/tempo-query.yaml
diff --git a/ops/docker-compose/tooling/observability/grafana/grafana.yaml b/ops/docker-compose/tooling/observability/grafana/grafana.yaml
@@ -12,7 +12,6 @@ services:
   grafana:
     depends_on:
       - coredns
-      - keycloak
     image: grafana/grafana:main
     container_name: grafana
     restart: on-failure