Skip to content
Snippets Groups Projects
Unverified Commit e744ac89 authored by Kevin Aleman's avatar Kevin Aleman Committed by GitHub
Browse files

chore: Set `tempo` version to `2.6.1` (#35081)

parent 8bfa650d
No related branches found
No related tags found
No related merge requests found
...@@ -2,27 +2,27 @@ services: ...@@ -2,27 +2,27 @@ services:
# Tempo runs as user 10001, and docker compose creates the volume as root. # Tempo runs as user 10001, and docker compose creates the volume as root.
# As such, we need to chown the volume in order for Tempo to start correctly. # As such, we need to chown the volume in order for Tempo to start correctly.
init: init:
image: &tempoImage grafana/tempo:latest image: &tempoImage grafana/tempo:2.6.1
user: root user: root
entrypoint: entrypoint:
- "chown" - 'chown'
- "10001:10001" - '10001:10001'
- "/var/tempo" - '/var/tempo'
volumes: volumes:
- ./tempo-data:/var/tempo - ./tempo-data:/var/tempo
tempo: tempo:
image: *tempoImage image: *tempoImage
command: [ "-config.file=/etc/tempo.yaml" ] command: ['-config.file=/etc/tempo.yaml']
volumes: volumes:
- ./tempo.yml:/etc/tempo.yaml - ./tempo.yml:/etc/tempo.yaml
- ./tempo-data:/var/tempo - ./tempo-data:/var/tempo
ports: ports:
- "14268" # jaeger ingest - '14268' # jaeger ingest
- "3200" # tempo - '3200' # tempo
- "4317" # otlp grpc - '4317' # otlp grpc
- "4318" # otlp http - '4318' # otlp http
- "9411" # zipkin2024-04-23T16:16:57+0000 - '9411' # zipkin2024-04-23T16:16:57+0000
depends_on: depends_on:
- init - init
...@@ -38,12 +38,12 @@ services: ...@@ -38,12 +38,12 @@ services:
otel-collector: otel-collector:
image: otel/opentelemetry-collector-contrib:0.100.0 image: otel/opentelemetry-collector-contrib:0.100.0
command: command:
- "--config" - '--config'
- "/otel-local-config.yaml" - '/otel-local-config.yaml'
volumes: volumes:
- ./collector.config.yml:/otel-local-config.yaml - ./collector.config.yml:/otel-local-config.yaml
ports: ports:
- "4317:4317" - '4317:4317'
# And put them in a Grafana Agent pipeline... # And put them in a Grafana Agent pipeline...
agent: agent:
...@@ -51,8 +51,8 @@ services: ...@@ -51,8 +51,8 @@ services:
volumes: volumes:
- ./agent.yml:/etc/agent.yaml - ./agent.yml:/etc/agent.yaml
entrypoint: entrypoint:
- /bin/agent - /bin/agent
- -config.file=/etc/agent.yaml - -config.file=/etc/agent.yaml
prometheus: prometheus:
image: prom/prometheus:latest image: prom/prometheus:latest
...@@ -64,7 +64,7 @@ services: ...@@ -64,7 +64,7 @@ services:
volumes: volumes:
- ./prometheus.yml:/etc/prometheus.yaml - ./prometheus.yml:/etc/prometheus.yaml
ports: ports:
- "9090:9090" - '9090:9090'
grafana: grafana:
image: grafana/grafana:11.0.0 image: grafana/grafana:11.0.0
...@@ -76,4 +76,4 @@ services: ...@@ -76,4 +76,4 @@ services:
- GF_AUTH_DISABLE_LOGIN_FORM=true - GF_AUTH_DISABLE_LOGIN_FORM=true
- GF_FEATURE_TOGGLES_ENABLE=traceqlEditor - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor
ports: ports:
- "4001:3000" - '4001:3000'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment