Merge remote-tracking branch 'upstream/main' into 2025/add/fluentd

Author: mrnicegyu11

services/graylog/docker-compose.yml.j2

@@ -48,7 +48,7 @@ services:
           cpus: "0.1"
   # Graylog: https://hub.docker.com/r/graylog/graylog/
   graylog:
-    image: graylog/graylog:6.0.5
+    image: graylog/graylog:6.2.2
     init: true
     # user: "1000:1001"
     configs:

services/jaeger/docker-compose.yml.j2

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   jaeger:
-    image: jaegertracing/all-in-one:1.60.0
+    image: jaegertracing/all-in-one:1.68.0
     command: >
       --query.base-path=/jaeger
     init: true
@@ -33,7 +33,7 @@ services:
           memory: 64M
           cpus: "0.1"
   otel-collector:
-    image: otel/opentelemetry-collector-contrib:0.105.0
+    image: otel/opentelemetry-collector-contrib:0.123.0
     configs:
       - source: opentelemetry-collector-config
         target: /etc/otel/config.yaml

services/monitoring/docker-compose.yml.j2

@@ -25,7 +25,7 @@ services:
           cpus: "0.1"
   prometheuscatchall:
     hostname: "{% raw %}{{.Service.Name}}{% endraw %}"
-    image: prom/prometheus:v2.54.0
+    image: prom/prometheus:v2.55.1
     volumes:
       - prometheus_data:/prometheus
       - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -71,7 +71,7 @@ services:
           cpus: "0.2"
   prometheusfederation:
     hostname: "{% raw %}{{.Service.Name}}{% endraw %}"
-    image: prom/prometheus:v2.54.0
+    image: prom/prometheus:v2.55.1
     volumes:
       - prometheus_data_federation:/prometheus
       - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -218,7 +218,7 @@ services:
           cpus: "0.1"
 
   grafana:
-    image: grafana/grafana-oss:11.2.4
+    image: grafana/grafana-oss:12.0.0
     volumes:
       - grafana_data:/var/lib/grafana
     env_file:
@@ -370,7 +370,7 @@ services:
           memory: 32M
           cpus: "0.1"
   tempo:
-    image: grafana/tempo:2.6.1
+    image: grafana/tempo:2.7.2
     command: "-target=scalable-single-binary -config.file=/etc/tempo.yaml"
     configs:
       - source: tempo_config

services/monitoring/tempo_config.yaml.j2

@@ -6,7 +6,9 @@ distributor:
     otlp:
       protocols:
         http:
+          endpoint: "0.0.0.0:4318"  # Explicitly bind to all interfaces https://github.com/grafana/tempo/issues/4465
         grpc:
+          endpoint: "0.0.0.0:4317"  # Explicitly bind to all interfaces https://github.com/grafana/tempo/issues/4465
 
 #ingester:
 #  max_block_duration: 5m               # cut the headblock when this much time passes. this should probably be left alone normally
@@ -38,13 +40,10 @@ storage:
       secret_key:  {{S3_SECRET_KEY}}
       insecure: false
       tls_insecure_skip_verify: true
-      # For using AWS, select the appropriate regional endpoint and region
-      # endpoint: s3.dualstack.us-west-2.amazonaws.com
-      # region: us-west-2
 
 querier:
   frontend_worker:
-    frontend_address: localhost:9095
+    frontend_address: 0.0.0.0:9095
 
 overrides:
   defaults:

services/portainer/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   agent:
-    image: portainer/agent:2.20.3 # Needs to match portainer-ce version
+    image: portainer/agent:2.27.6 # Needs to match portainer-ce version
     init: true
     environment:
       # REQUIRED: Should be equal to the service name prefixed by "tasks." when
@@ -26,7 +26,7 @@ services:
           memory: 50M
 
   portainer:
-    image: portainer/portainer-ce:2.20.3
+    image: portainer/portainer-ce:2.27.6
     init: true
     command: >
       -H tcp://tasks.agent:9001 --tlsskipverify

services/traefik/docker-compose.yml.j2

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: "traefik:v3.1.2@sha256:ec1a82940b8e00eaeef33fb4113aa1d1573b2ebb6440e10c023743fe96f08475"
+    image: "traefik:v3.4.0"
     init: true
     command:
       - "--api=true"