Merge current v2.11 into v3.2

This commit is contained in:
mmatur 2025-01-02 15:43:49 +01:00
commit ee449db656
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
70 changed files with 229 additions and 223 deletions

View file

@ -2,7 +2,7 @@ version: "3.8"
services:
tempo:
hostname: tempo
image: grafana/tempo:latest
image: grafana/tempo:2.6.1
command: [ "-config.file=/etc/tempo.yaml" ]
volumes:
- ./fixtures/tracing/tempo.yaml:/etc/tempo.yaml