t push

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

Author: mrnicegyu11

services/simcore/docker-compose.deploy.aws.yml

@@ -56,10 +56,9 @@ services:
       - "--providers.swarm.refreshSeconds=1"
       - "--providers.swarm.exposedByDefault=false"
       - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
-      - "--tracing=true"
-      - "--tracing.addinternals"
-      - "--tracing.otlp=true"
-      - "--tracing.otlp.http=true"
+      - "--tracing.serviceName=simcore-traefik"
+      - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
+      - "--tracing.addinternals=false"
     deploy:
       resources:
         limits:

services/simcore/docker-compose.deploy.dalco.yml

@@ -51,10 +51,9 @@ services:
             - "--providers.swarm.refreshSeconds=1"
             - "--providers.swarm.exposedByDefault=false"
             - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
-            - "--tracing=true"
-            - "--tracing.addinternals"
-            - "--tracing.otlp=true"
-            - "--tracing.otlp.http=true"
+            - "--tracing.serviceName=simcore-traefik"
+            - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
+            - "--tracing.addinternals=false"
         deploy:
             resources:
                 limits:

services/simcore/docker-compose.deploy.local.yml

@@ -108,10 +108,9 @@ services:
       - "--providers.swarm.refreshSeconds=1"
       - "--providers.swarm.exposedByDefault=false"
       - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
-      - "--tracing=true"
-      - "--tracing.addinternals"
-      - "--tracing.otlp=true"
-      - "--tracing.otlp.http=true"
+      - "--tracing.serviceName=simcore-traefik"
+      - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
+      - "--tracing.addinternals=false"
     deploy:
       labels:
         # oSparc postgres

services/simcore/docker-compose.deploy.master.yml

@@ -49,11 +49,9 @@ services:
       - "--providers.swarm.refreshSeconds=1"
       - "--providers.swarm.exposedByDefault=false"
       - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
-      #- "--tracing=true"
-      #- "--tracing.addinternals"
-      #- "--tracing.otlp=true"
-      #- "--tracing.otlp.http=true"
-      - "--tracing.otlp.http.endpoint=https://otel-collector:4318/v1/traces"
+      - "--tracing.serviceName=simcore-traefik"
+      - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
+      - "--tracing.addinternals=false"
     deploy:
       resources:
         limits:

services/simcore/docker-compose.deploy.public.yml

@@ -45,10 +45,9 @@ services:
       - "--providers.swarm.refreshSeconds=1"
       - "--providers.swarm.exposedByDefault=false"
       - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
-      - "--tracing"
-      - "--tracing.addinternals"
-      - "--tracing.otlp=true"
-      - "--tracing.otlp.http=true"
+      - "--tracing.serviceName=simcore-traefik"
+      - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
+      - "--tracing.addinternals=false"
     deploy:
       labels:
         - prometheus-job=traefik_simcore_production

services/traefik/docker-compose.yml.j2

@@ -28,6 +28,11 @@ services:
         published: 5672
         mode: host
       {% endif %}
+      {% if OPS_TRAEFIK_EXPOSE_REDIS|lower == "true" %}
+      - target: 6379
+        published: 6379
+        mode: host
+      {% endif %}
     configs:
       - source: traefik_dynamic_config.yml
         target: /etc/traefik/dynamic_conf.yml

services/traefik/template.env

@@ -24,6 +24,7 @@ ROUTE53_DNS_CHALLANGE_SECRET_KEY=${ROUTE53_DNS_CHALLANGE_SECRET_KEY}
 
 OPS_TRAEFIK_EXPOSE_POSTGRES=${OPS_TRAEFIK_EXPOSE_POSTGRES}
 OPS_TRAEFIK_EXPOSE_RABBITMQ=${OPS_TRAEFIK_EXPOSE_RABBITMQ}
+OPS_TRAEFIK_EXPOSE_REDIS=${OPS_TRAEFIK_EXPOSE_REDIS}
 STORAGE_DOMAIN=${STORAGE_DOMAIN}
 REGISTRY_DOMAIN=${REGISTRY_DOMAIN}
 S3_ENDPOINT=${S3_ENDPOINT}
@@ -88,9 +89,8 @@ TRAEFIK_PING_ENTRYPOINT=ping
 TRAEFIK_PING=true
 TRAEFIK_ENTRYPOINTS_METRICS_ADDRESS=:8082
 TRAEFIK_ENTRYPOINTS_POSTGRES_ADDRESS=:5432
-TRAEFIK_ENTRYPOINTS_RABBIT_ADDRESS=:5672
+TRAEFIK_ENTRYPOINTS_RABBITMQ_ADDRESS=:5672
 TRAEFIK_ENTRYPOINTS_REDIS_ADDRESS=:${REDIS_EXTERNAL_PORT}
-
 # Providers
 TRAEFIK_PROVIDERS_SWARM_ENDPOINT=unix:///var/run/docker.sock
 TRAEFIK_PROVIDERS_SWARM_EXPOSEDBYDEFAULT=false