From fdead2d32ff2c819b8b11268c7f7d2a4d58073f2 Mon Sep 17 00:00:00 2001 From: Thorsten Hans Date: Thu, 27 Nov 2025 10:09:06 +0100 Subject: [PATCH 1/2] chore: bump all image tags to most recent versions Signed-off-by: Thorsten Hans --- otel-config/compose.aspire.yaml | 2 +- otel-config/compose.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/otel-config/compose.aspire.yaml b/otel-config/compose.aspire.yaml index 7f9e4df..560811a 100644 --- a/otel-config/compose.aspire.yaml +++ b/otel-config/compose.aspire.yaml @@ -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 diff --git a/otel-config/compose.yaml b/otel-config/compose.yaml index 172fbaa..b94180f 100644 --- a/otel-config/compose.yaml +++ b/otel-config/compose.yaml @@ -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" @@ -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: @@ -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" @@ -47,7 +47,7 @@ services: - "9090:9090" grafana: - image: grafana/grafana:12.0.1 + image: grafana/grafana:12.1 ports: - 5050:3000 volumes: @@ -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: From e397abc6a035340fc2bba6d2a1128f991536d4c2 Mon Sep 17 00:00:00 2001 From: Thorsten Hans Date: Thu, 27 Nov 2025 10:40:59 +0100 Subject: [PATCH 2/2] chore: use otel endpoint for ingesting logs to loki Signed-off-by: Thorsten Hans --- otel-config/otel-collector-config.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/otel-config/otel-collector-config.yaml b/otel-config/otel-collector-config.yaml index 200b1b1..17931ff 100644 --- a/otel-config/otel-collector-config.yaml +++ b/otel-config/otel-collector-config.yaml @@ -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: @@ -47,4 +46,4 @@ service: logs: receivers: [otlp] processors: [batch] - exporters: [debug, loki] \ No newline at end of file + exporters: [debug, otlphttp/loki] \ No newline at end of file