From 3a0e944f637464ae74539674defdfb1a105e79ea Mon Sep 17 00:00:00 2001 From: Dustin Kaiser <8209087+mrnicegyu11@users.noreply.github.com> Date: Wed, 13 Nov 2024 16:38:02 +0100 Subject: [PATCH] Sister PR for https://github.com/ITISFoundation/osparc-simcore/pull/6691 (#872) * wip * Add csi-s3 and have portainer use it * Change request @hrytsuk 1GB max portainer volume size * Sister PR6691 --------- Co-authored-by: Dustin Kaiser --- services/jaeger/docker-compose.yml | 4 ++++ services/jaeger/template.env | 1 + 2 files changed, 5 insertions(+) diff --git a/services/jaeger/docker-compose.yml b/services/jaeger/docker-compose.yml index 233323b8..bab078de 100644 --- a/services/jaeger/docker-compose.yml +++ b/services/jaeger/docker-compose.yml @@ -51,6 +51,7 @@ services: networks: - public - monitored + - interactive_services_subnet environment: TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE: ${TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE} TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE: ${TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE} @@ -63,3 +64,6 @@ networks: monitored: name: ${MONITORED_NETWORK} external: true + interactive_services_subnet: + name: ${SWARM_STACK_NAME}_interactive_services_subnet + external: true diff --git a/services/jaeger/template.env b/services/jaeger/template.env index 19475b1a..2081f593 100644 --- a/services/jaeger/template.env +++ b/services/jaeger/template.env @@ -5,3 +5,4 @@ TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE=${TRACING_OPENTELEMETRY_COLLECTOR_BAT TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE=${TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE} TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT=${TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT} TRACING_OPENTELEMETRY_COLLECTOR_SERVICE_TELEMETRY_LOG_LEVEL=${TRACING_OPENTELEMETRY_COLLECTOR_SERVICE_TELEMETRY_LOG_LEVEL} +SWARM_STACK_NAME=${SWARM_STACK_NAME}