Merge remote-tracking branch 'upstream/main'

mrnicegyu11 · mrnicegyu11 · commit 3a21f0f2c89d · 2025-03-28T09:34:56.000+01:00
diff --git a/services/monitoring/grafana/terraform/dashboards.tf b/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
 }
diff --git a/services/registry/docker-compose.yml.j2 b/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
diff --git a/services/simcore/docker-compose.yml b/services/simcore/docker-compose.yml
@@ -344,6 +344,7 @@ services:
     networks:
       - monitored
     deploy:
+      replicas: ${SIMCORE_STORAGE_REPLICAS}
       labels:
         # internal traefik
         - traefik.enable=true

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ resource "grafana_dashboard" "dashboards" {`
`30`	`30`	`]]`
`31`	`31`	`))`
`32`	`32`	`# CSV approach`
`33`		`- config_json = jsonencode(jsondecode(file(split(",", each.value)[1])).dashboard)`
	`33`	`+ config_json = jsonencode(jsondecode(file(split(",", each.value)[1])))`
`34`	`34`	`folder = grafana_folder.subfolders[split(",", each.value)[0]].id`
`35`	`35`	`}`