Skip to content

Commit 191a1ad

Browse files
committed
Connect traefik to open telemetry
1 parent 3ea41b5 commit 191a1ad

10 files changed

+18
-41
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,8 @@ services:
5656
- "--providers.swarm.refreshSeconds=1"
5757
- "--providers.swarm.exposedByDefault=false"
5858
- "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
59-
- "--tracing=true"
60-
- "--tracing.addinternals"
61-
- "--tracing.otlp=true"
62-
- "--tracing.otlp.http=true"
59+
- "--tracing.serviceName=simcore-traefik"
60+
- "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
6361
deploy:
6462
resources:
6563
limits:

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@ services:
5151
- "--providers.swarm.refreshSeconds=1"
5252
- "--providers.swarm.exposedByDefault=false"
5353
- "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
54-
- "--tracing=true"
55-
- "--tracing.addinternals"
56-
- "--tracing.otlp=true"
57-
- "--tracing.otlp.http=true"
54+
- "--tracing.serviceName=simcore-traefik"
55+
- "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
5856
deploy:
5957
resources:
6058
limits:

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,8 @@ services:
9696
- "--providers.swarm.refreshSeconds=1"
9797
- "--providers.swarm.exposedByDefault=false"
9898
- "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
99-
- "--tracing=true"
100-
- "--tracing.addinternals"
101-
- "--tracing.otlp=true"
102-
- "--tracing.otlp.http=true"
99+
- "--tracing.serviceName=simcore-traefik"
100+
- "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
103101
deploy:
104102
labels:
105103
# oSparc postgres

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,8 @@ services:
4848
- "--providers.swarm.refreshSeconds=1"
4949
- "--providers.swarm.exposedByDefault=false"
5050
- "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
51-
#- "--tracing=true"
52-
#- "--tracing.addinternals"
53-
#- "--tracing.otlp=true"
54-
#- "--tracing.otlp.http=true"
55-
- "--tracing.otlp.http.endpoint=https://otel-collector:4318/v1/traces"
51+
- "--tracing.serviceName=simcore-traefik"
52+
- "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
5653
deploy:
5754
resources:
5855
limits:

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ services:
4545
- "--providers.swarm.refreshSeconds=1"
4646
- "--providers.swarm.exposedByDefault=false"
4747
- "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
48-
- "--tracing"
49-
- "--tracing.addinternals"
50-
- "--tracing.otlp=true"
51-
- "--tracing.otlp.http=true"
48+
- "--tracing.serviceName=simcore-traefik"
49+
- "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
5250
deploy:
5351
labels:
5452
- prometheus-job=traefik_simcore_production

services/traefik/docker-compose.dalco.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ services:
2727
- "--providers.swarm.endpoint=unix:///var/run/docker.sock"
2828
- "--providers.swarm.exposedByDefault=false"
2929
- "--core.defaultRuleSyntax=v2"
30-
- "--tracing=true"
31-
- "--tracing.addinternals"
32-
- "--tracing.otlp=true"
33-
- "--tracing.otlp.http=true"
30+
- "--tracing.serviceName=ops-traefik"
31+
- "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
3432
- "--providers.swarm.constraints=!LabelRegex(`io.simcore.zone`, `.+`)"
3533
- "--entryPoints.https.forwardedHeaders.insecure"
3634
- "--providers.file.directory=/etc/traefik/"

services/traefik/docker-compose.letsencrypt.http.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ services:
2020
- "--providers.swarm.exposedByDefault=false"
2121
- "--providers.swarm.constraints=!LabelRegex(`io.simcore.zone`, `.+`)"
2222
- "--core.defaultRuleSyntax=v2"
23-
- "--tracing=true"
24-
- "--tracing.addinternals"
25-
- "--tracing.otlp=true"
26-
- "--tracing.otlp.http=true"
23+
- "--tracing.serviceName=ops-traefik"
24+
- "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
2725
- "--certificatesresolvers.lehttpchallenge.acme.httpchallenge=true"
2826
- "--certificatesresolvers.lehttpchallenge.acme.httpchallenge.entrypoint=http"
2927
- "--certificatesresolvers.lehttpchallenge.acme.email=${OSPARC_DEVOPS_MAIL_ADRESS}"

services/traefik/docker-compose.local.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,8 @@ services:
4040
- "--providers.swarm.exposedByDefault=false"
4141
- "--providers.swarm.constraints=!LabelRegex(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
4242
- "--core.defaultRuleSyntax=v2"
43-
- "--tracing=true"
44-
- "--tracing.addinternals"
45-
- "--tracing.otlp=true"
46-
- "--tracing.otlp.http=true"
43+
- "--tracing.serviceName=ops-traefik"
44+
- "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
4745
- "--providers.file.directory=/etc/traefik/"
4846
- "--providers.file.watch=true"
4947
networks:

services/traefik/docker-compose.master.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ services:
2727
- "--providers.swarm.endpoint=unix:///var/run/docker.sock"
2828
- "--providers.swarm.exposedByDefault=false"
2929
- "--core.defaultRuleSyntax=v2"
30-
- "--tracing=true"
31-
- "--tracing.addinternals"
32-
- "--tracing.otlp=true"
33-
- "--tracing.otlp.http=true"
3430
- "--providers.swarm.constraints=!LabelRegex(`io.simcore.zone`, `.+`)"
3531
- "--entryPoints.https.forwardedHeaders.insecure"
3632
- "--providers.file.directory=/etc/traefik/"

services/traefik/docker-compose.public.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ services:
2828
- "--providers.swarm.endpoint=unix:///var/run/docker.sock"
2929
- "--providers.swarm.exposedByDefault=false"
3030
- "--core.defaultRuleSyntax=v2"
31-
- "--tracing=true"
32-
- "--tracing.addinternals"
33-
- "--tracing.otlp=true"
34-
- "--tracing.otlp.http=true"
31+
- "--tracing.serviceName=ops-traefik"
32+
- "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
3533
- "--providers.swarm.constraints=!LabelRegex(`io.simcore.zone`, `.+`)"
3634
- "--entryPoints.https.forwardedHeaders.insecure"
3735
- "--providers.file.directory=/etc/traefik/"

0 commit comments

Comments
 (0)