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

Author: mrnicegyu11

charts/victoria-logs/values.ebs-storage.yaml.gotmpl

@@ -0,0 +1,5 @@
+server:
+  persistentVolume:
+    enabled: true
+    storageClassName: "{{ .Values.ebsStorageClassName }}"
+    size: 10Gi

charts/victoria-logs/values.topolvm-storage.yaml.gotmpl

@@ -0,0 +1,5 @@
+server:
+  persistentVolume:
+    enabled: true
+    storageClassName: "{{ .Values.topolvmStorageClassName }}"
+    size: 10Gi

charts/victoria-logs/values.yaml.gotmpl

@@ -29,11 +29,6 @@ server:
           - /logs
         pathType: Prefix
 
-  persistentVolume:
-    enabled: true
-    storageClassName: "{{ .Values.ebsStorageClassName }}"
-    size: 10Gi
-
   nodeSelector:
     ops: "true"
 

services/adminer/docker-compose.yml

@@ -13,7 +13,7 @@ services:
     deploy:
       labels:
         - traefik.enable=true
-        - traefik.docker.network=${PUBLIC_NETWORK}
+        - traefik.swarm.network=${PUBLIC_NETWORK}
         - traefik.http.services.adminer_simcore.loadbalancer.server.port=8080
         - traefik.http.routers.adminer_simcore.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/adminer/simcore`)
         - traefik.http.routers.adminer_simcore.entrypoints=https

services/metabase/docker-compose.yml.j2

@@ -43,7 +43,7 @@ services:
         - prometheus-port=9191
         # TODO: add prometheus metrics
         - traefik.enable=true
-        - traefik.docker.network=${PUBLIC_NETWORK}
+        - traefik.swarm.network=${PUBLIC_NETWORK}
         # router
         - traefik.http.routers.metabase.rule=Host(`${ADMIN_DOMAIN}`) && PathPrefix(`/metabase`)
         - traefik.http.routers.metabase.entrypoints=https

services/monitoring/.gitignore

@@ -2,3 +2,4 @@ docker-compose.aws.yml
 docker-compose.dalco.yml
 docker-compose.public.yml
 docker-compose.master.yml
+docker-compose.local.yml

services/monitoring/Makefile

@@ -71,7 +71,7 @@ docker-compose.dalco.yml: docker-compose.dalco.yml.j2 config.prometheus.ceph.sim
 	# generating $@
 	@$(call jinja,$<,.env,$@)
 
-docker-compose.public.yml: docker-compose.public.yml.j2 config.prometheus $(COMMON_COMPOSE_DEPENDENCIES)
+docker-compose.public.yml: docker-compose.public.yml.j2 config.prometheus.simcore $(COMMON_COMPOSE_DEPENDENCIES)
 	# generating $@
 	@$(call jinja,$<,.env,$@)
 
@@ -83,6 +83,10 @@ docker-compose.master.yml: docker-compose.master.yml.j2 config.prometheus.ceph.s
 	# generating $@
 	@$(call jinja,$<,.env,$@)
 
+docker-compose.local.yml: docker-compose.local.yml.j2 config.prometheus.ceph.simcore $(COMMON_COMPOSE_DEPENDENCIES)
+	# generating $@
+	@$(call jinja,$<,.env,$@)
+
 #
 # temp compose targets
 #
@@ -101,8 +105,8 @@ ${TEMP_COMPOSE}-aws: docker-compose.yml  docker-compose.aws.yml $(TEMP_COMPOSE_C
 ${TEMP_COMPOSE}-master: docker-compose.yml docker-compose.master.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
 	@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.master.yml > $@
 
-${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.master.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
-	@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@
+${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.local.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
+	@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.local.yml > $@
 
 #
 # artifacts targets

services/monitoring/docker-compose.local.yml.j2

@@ -0,0 +1,26 @@
+version: '3.7'
+services:
+  grafana:
+    deploy:
+      placement:
+        constraints: []
+  prometheuscatchall:
+    deploy:
+      placement:
+        constraints: []
+  prometheusfederation:
+    deploy:
+      placement:
+        constraints: []
+  redis-exporter:
+    deploy:
+      placement:
+        constraints: []
+  postgres-exporter:
+    deploy:
+      placement:
+        constraints: []
+configs:
+  prometheus_config:
+    name: ${STACK_NAME}_prometheus_config_{{ "./prometheus/prometheus.yml" | sha256file | substring(0,10) }}
+    file: ./prometheus/prometheus.yml

services/monitoring/docker-compose.yml.j2

@@ -408,9 +408,6 @@ configs:
   prometheus_config_federation:
     name: ${STACK_NAME}_prometheus_config_federation_{{ "./prometheus/prometheus-federation.yml" | sha256file | substring(0,10) }}
     file: ./prometheus/prometheus-federation.yml
-  prometheus_config:
-    name: ${STACK_NAME}_prometheus_config_{{ "./prometheus/prometheus.yml" | sha256file | substring(0,10) }}
-    file: ./prometheus/prometheus.yml
   prometheus_rules:
     name: ${STACK_NAME}_prometheus_rules_{{ "./prometheus/prometheus.rules.yml" | sha256file | substring(0,10) }}
     file: ./prometheus/prometheus.rules.yml

services/monitoring/tempo_config.yaml.j2

@@ -32,7 +32,8 @@ metrics_generator:
     path: /var/tempo/generator/wal
     remote_write:
       - url: {{ TF_VAR_PROMETHEUS_CATCHALL_URL }}/api/v1/write
-
+  traces_storage:   # traces_storage is REQUIRED whenever the local-blocks processor is enabled.
+    path: /var/tempo/generator/traces   # <--- create & persist this directory
 storage:
   trace:
     backend: s3                        # backend configuration to use