Merge remote-tracking branch 'upstream/main' into 2024/add/tempo

Author: mrnicegyu11

services/monitoring/grafana/terraform/dashboards.tf

@@ -30,6 +30,6 @@ resource "grafana_dashboard" "dashboards" {
     ]]
   ))
   # CSV approach
-  config_json = jsonencode(jsondecode(file(split(",", each.value)[1])).dashboard)
+  config_json = jsonencode(jsondecode(file(split(",", each.value)[1])))
   folder      = grafana_folder.subfolders[split(",", each.value)[0]].id
 }

services/registry/docker-compose.yml.j2

@@ -38,7 +38,7 @@ services:
       replicas: ${OPS_REGISTRY_REPLICAS}
       placement:
         constraints:
-          - node.labels.io.simcore.autoscaled-node!=true
+          - node.labels.ops==true
       resources:
         limits:
           memory: 1G

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

@@ -79,7 +79,3 @@ services:
   wb-api-server:
     deploy:
       replicas: 3
-
-  storage:
-    deploy:
-      replicas: 1

services/simcore/docker-compose.yml

@@ -344,6 +344,7 @@ services:
     networks:
       - monitored
     deploy:
+      replicas: ${SIMCORE_STORAGE_REPLICAS}
       labels:
         # internal traefik
         - traefik.enable=true