Skip to content

Commit e744ac8

Browse files
authored
chore: Set tempo version to 2.6.1 (#35081)
1 parent 8bfa650 commit e744ac8

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

development/docker-compose-monitoring.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@ services:
22
# Tempo runs as user 10001, and docker compose creates the volume as root.
33
# As such, we need to chown the volume in order for Tempo to start correctly.
44
init:
5-
image: &tempoImage grafana/tempo:latest
5+
image: &tempoImage grafana/tempo:2.6.1
66
user: root
77
entrypoint:
8-
- "chown"
9-
- "10001:10001"
10-
- "/var/tempo"
8+
- 'chown'
9+
- '10001:10001'
10+
- '/var/tempo'
1111
volumes:
1212
- ./tempo-data:/var/tempo
1313

1414
tempo:
1515
image: *tempoImage
16-
command: [ "-config.file=/etc/tempo.yaml" ]
16+
command: ['-config.file=/etc/tempo.yaml']
1717
volumes:
1818
- ./tempo.yml:/etc/tempo.yaml
1919
- ./tempo-data:/var/tempo
2020
ports:
21-
- "14268" # jaeger ingest
22-
- "3200" # tempo
23-
- "4317" # otlp grpc
24-
- "4318" # otlp http
25-
- "9411" # zipkin2024-04-23T16:16:57+0000
21+
- '14268' # jaeger ingest
22+
- '3200' # tempo
23+
- '4317' # otlp grpc
24+
- '4318' # otlp http
25+
- '9411' # zipkin2024-04-23T16:16:57+0000
2626
depends_on:
2727
- init
2828

@@ -38,21 +38,21 @@ services:
3838
otel-collector:
3939
image: otel/opentelemetry-collector-contrib:0.100.0
4040
command:
41-
- "--config"
42-
- "/otel-local-config.yaml"
41+
- '--config'
42+
- '/otel-local-config.yaml'
4343
volumes:
4444
- ./collector.config.yml:/otel-local-config.yaml
4545
ports:
46-
- "4317:4317"
46+
- '4317:4317'
4747

4848
# And put them in a Grafana Agent pipeline...
4949
agent:
5050
image: grafana/agent:v0.27.1
5151
volumes:
5252
- ./agent.yml:/etc/agent.yaml
5353
entrypoint:
54-
- /bin/agent
55-
- -config.file=/etc/agent.yaml
54+
- /bin/agent
55+
- -config.file=/etc/agent.yaml
5656

5757
prometheus:
5858
image: prom/prometheus:latest
@@ -64,7 +64,7 @@ services:
6464
volumes:
6565
- ./prometheus.yml:/etc/prometheus.yaml
6666
ports:
67-
- "9090:9090"
67+
- '9090:9090'
6868

6969
grafana:
7070
image: grafana/grafana:11.0.0
@@ -76,4 +76,4 @@ services:
7676
- GF_AUTH_DISABLE_LOGIN_FORM=true
7777
- GF_FEATURE_TOGGLES_ENABLE=traceqlEditor
7878
ports:
79-
- "4001:3000"
79+
- '4001:3000'

0 commit comments

Comments
 (0)