Skip to content

Commit

Permalink
Merge branch 'main' into test-agg-start-times
Browse files Browse the repository at this point in the history
  • Loading branch information
pellared authored May 9, 2024
2 parents 0d453c1 + 4e03b7e commit 9ccee9a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions example/otel-collector/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@

services:
otel-collector:
image: otel/opentelemetry-collector-contrib:0.91.0
image: otel/opentelemetry-collector-contrib:0.100.0
command: ["--config=/etc/otel-collector.yaml"]
volumes:
- ./otel-collector.yaml:/etc/otel-collector.yaml
ports:
- 4317:4317

prometheus:
image: prom/prometheus:v2.45.2
image: prom/prometheus:v2.52.0
volumes:
- ./prometheus.yaml:/etc/prometheus/prometheus.yml
ports:
- 9090:9090

jaeger:
image: jaegertracing/all-in-one:1.52
image: jaegertracing/all-in-one:1.57
ports:
- 16686:16686

0 comments on commit 9ccee9a

Please sign in to comment.