Jaeger: rolling config update (#1020)

Ensure jaeger is deployed automatically on config content changes

Related Issue(s):
* #984

Author: YuryHrytsuk

services/jaeger/.gitignore

@@ -0,0 +1 @@
+docker-compose.yml

services/jaeger/Makefile

@@ -41,6 +41,9 @@ up-local: up
 
 # Helpers -------------------------------------------------
 
+docker-compose.yml: docker-compose.yml.j2 .venv .env
+	@$(call jinja, $<, .env, $@)
+
 .PHONY: ${TEMP_COMPOSE}
 ${TEMP_COMPOSE}: docker-compose.yml
 	@${REPO_BASE_DIR}/scripts/docker-stack-config.bash $< > $@

services/jaeger/docker-compose.yml renamed to services/jaeger/docker-compose.yml.j2

@@ -1,7 +1,5 @@
 version: "3.7"
-configs:
-  opentelemetry-collector-config:
-    file: ./opentelemetry-collector-config.yaml
+
 services:
   jaeger:
     image: jaegertracing/all-in-one:1.60.0
@@ -39,7 +37,7 @@ services:
     configs:
       - source: opentelemetry-collector-config
         target: /etc/otel/config.yaml
-    hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
+    hostname: "{% raw %}{{.Node.Hostname}}-{{.Task.Slot}}{% endraw %}"
     command:
       - "--config=/etc/otel/config.yaml"
     deploy:
@@ -57,6 +55,12 @@ services:
       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}
+
+configs:
+  opentelemetry-collector-config:
+    name: ${STACK_NAME}_opentelemetry-collector-config_{{ "./opentelemetry-collector-config.yaml" | sha256file | substring(0,10) }}
+    file: ./opentelemetry-collector-config.yaml
+
 networks:
   public:
     external: true

services/jaeger/template.env

@@ -1,3 +1,4 @@
+STACK_NAME=${STACK_NAME}
 MONITORING_DOMAIN=${MONITORING_DOMAIN}
 PUBLIC_NETWORK=${PUBLIC_NETWORK}
 MONITORED_NETWORK=${MONITORED_NETWORK}