minor fixes

scripts/deployments/deploy.sh

@@ -49,7 +49,6 @@ minio_enabled=1
 start_simcore=0
 start_opsstack=0
 stack_target=local
-without_deploy_agent=1
 
 usage="$(basename "$0") [-h] [--key=value]
 
@@ -61,8 +60,7 @@ where keys are:
     --minio_enabled             (default: ${minio_enabled})
     --start_opsstack            (default: ${start_opsstack})
     --stack_target              (default: ${stack_target})
-    --vcs_check         (default: ${vcs_check})
-    --without_deploy_agent      (default: ${without_deploy_agent})"
+    --vcs_check         (default: ${vcs_check})"
 
 for i in "$@"; do
     case $i in # Infos on bash case statements https://linuxize.com/post/bash-case-statement/
@@ -86,10 +84,6 @@ for i in "$@"; do
         vcs_check="${i#*=}"
         ;;
         ##
-        --without_deploy_agent=*)
-        without_deploy_agent="${i#*=}"
-        ;;
-        ##
         :|--help|-h)
         echo "$usage" && exit 0
         shift
@@ -266,16 +260,8 @@ if [ "$start_opsstack" -eq 0 ]; then
     popd
 fi
 if [ "$start_simcore" -eq 0 ]; then
-    if [ "$without_deploy_agent" -eq 0 ]; then
-        log_info "starting simcore without deployment agent..."
-        "${repo_basedir}"/scripts/deployments/start_without_deployment_agent.bash
-    else
-        # -------------------------------- DEPlOYMENT-AGENT -------------------------------
-        log_info "starting deployment-agent for simcore..."
-        pushd "${repo_basedir}"/services/deployment-agent;
-        make down up-"$stack_target";
-        popd
-    fi
+    log_info "starting simcore..."
+    "${repo_basedir}"/scripts/deployments/start_without_deployment_agent.bash
 fi
 # shellcheck disable=2235
 

services/monitoring/docker-compose.yml.j2

@@ -5,6 +5,7 @@ volumes:
   grafana_data: {}
   alertmanager_data: {}
   prometheus_data_cadvisor: {}
+  prometheus_data_federation: {}
 
 networks:
   internal:
@@ -40,7 +41,6 @@ services:
   prometheuscatchall:
     hostname: "{% raw %}{{.Service.Name}}{% endraw %}"
     image: prom/prometheus:v2.47.2
-    replicas: 0
     volumes:
       - prometheus_data:/prometheus
       - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -85,7 +85,7 @@ services:
         reservations:
           memory: 2048M
           cpus: "0.2"
-prometheusfederation:
+  prometheusfederation:
     hostname: "{% raw %}{{.Service.Name}}{% endraw %}"
     image: prom/prometheus:v2.47.2
     volumes:
@@ -160,6 +160,7 @@ prometheusfederation:
       - public
     extra_hosts: []
     deploy:
+      replicas: 0
       labels:
         - traefik.enable=true
         - traefik.docker.network=${PUBLIC_NETWORK}