Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion otel-config/compose.aspire.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
aspire-dashboard:
image: mcr.microsoft.com/dotnet/aspire-dashboard:9.2.0
image: mcr.microsoft.com/dotnet/aspire-dashboard:9.5.2
restart: always
environment:
- ASPIRE_ALLOW_UNSECURED_TRANSPORT=true
Expand Down
12 changes: 6 additions & 6 deletions otel-config/compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
otel-collector:
image: otel/opentelemetry-collector-contrib:0.127.0
image: otel/opentelemetry-collector-contrib:0.140.0
restart: always
command:
- "--config=/etc/otel-collector-config.yaml"
Expand All @@ -19,14 +19,14 @@ services:
- loki

jaeger:
image: jaegertracing/all-in-one:latest
image: jaegertracing/all-in-one:1.75.0
restart: always
ports:
- "16686:16686" # UI
- "14268" # can accept spans directly from clients in jaeger.thrift format over binary thrift protocol

tempo:
image: grafana/tempo:2.7.2
image: grafana/tempo:2.9.0
command:
- "-config.file=/etc/tempo/config.yaml"
volumes:
Expand All @@ -36,7 +36,7 @@ services:
- 7999:7999

prometheus:
image: prom/prometheus:latest
image: prom/prometheus:v3.7.3
restart: always
command:
- "--config.file=/etc/prometheus/prometheus.yaml"
Expand All @@ -47,7 +47,7 @@ services:
- "9090:9090"

grafana:
image: grafana/grafana:12.0.1
image: grafana/grafana:12.1
ports:
- 5050:3000
volumes:
Expand All @@ -61,7 +61,7 @@ services:
- tempo

loki:
image: grafana/loki:3.5.1
image: grafana/loki:3.5.8
command:
- "-config.file=/etc/loki/config.yaml"
volumes:
Expand Down
11 changes: 5 additions & 6 deletions otel-config/otel-collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,10 @@ exporters:
tls:
insecure: true

loki:
endpoint: http://loki:3100/loki/api/v1/push
default_labels_enabled:
exporter: false
job: true
otlphttp/loki:
endpoint: http://loki:3100/otlp
tls:
insecure: true

processors:
batch:
Expand All @@ -47,4 +46,4 @@ service:
logs:
receivers: [otlp]
processors: [batch]
exporters: [debug, loki]
exporters: [debug, otlphttp/loki]