Skip to content

Commit c770b72

Browse files
Instrument Traefik - Connect traefiks to opentelemetry (ITISFoundation#1041)
* wip * Add csi-s3 and have portainer use it * Change request @Hrytsuk 1GB max portainer volume size * Arch Linux Certificates Customization * Fix pgsql exporter failure * [Kubernetes] Introduce on-prem persistent Storage (Longhorn) 🎉 (ITISFoundation#979) * Introduce longhorn chart * Further longhorn configuration * Longhorn: further settings configuration * Fix longhorn configuration bugs Extra: introduce longhorn pv vales for portainer * Add comment for deletion longhorn * Further longhorn configuration * Add README.md for Longhorn wit FAQ * Update Longhorn readme * Update readme * Futher LH configuration * Update LH's Readme * Update Longhorn Readme * Improve LH's Readme * LH: Reduce reserved default disk space to 5% Since we use a dedicated disk for LH, we can go ahead with 5% * Use values to set Longhorn storage class * Update LH's Readme * LH Readme: add requirements reference * PR Review: bring back portainer s3 pv * LH: decrease portinaer volume size * Experimental: Try to add tracing to simcore-traefik on master * Connect traefik to open telemetry * revert accidental commit --------- Co-authored-by: Dustin Kaiser <[email protected]> Co-authored-by: YH <[email protected]>
1 parent 9fe9933 commit c770b72

File tree

5 files changed

+10
-21
lines changed

5 files changed

+10
-21
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
@@ -108,10 +108,8 @@ services:
108108
- "--providers.swarm.refreshSeconds=1"
109109
- "--providers.swarm.exposedByDefault=false"
110110
- "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
111-
- "--tracing=true"
112-
- "--tracing.addinternals"
113-
- "--tracing.otlp=true"
114-
- "--tracing.otlp.http=true"
111+
- "--tracing.serviceName=simcore-traefik"
112+
- "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
115113
deploy:
116114
labels:
117115
# oSparc postgres

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

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

0 commit comments

Comments
 (0)