From 555f420039b329f835105662c5daa24d200c60f4 Mon Sep 17 00:00:00 2001
From: YuryHrytsuk <yuryhrytsuk@gmail.com>
Date: Tue, 23 Sep 2025 09:16:28 +0200
Subject: [PATCH] Prometheus: scrape RabbitMQ Cluster

Extra: remove master_rabbit from simcore targets as we don't run simcore
rabbit on master deployments anymore (either AWS Rabbit or Cluster
Rabbit)

Related issue/s
* https://github.com/ITISFoundation/osparc-ops-environments/issues/1176
---
 services/monitoring/prometheus/prometheus-simcore.yml | 1 -
 services/rabbit/docker-compose.node0x.yml.j2          | 7 +++++++
 services/rabbit/template.env                          | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/services/monitoring/prometheus/prometheus-simcore.yml b/services/monitoring/prometheus/prometheus-simcore.yml
index c2cef05d5..23e6f6834 100644
--- a/services/monitoring/prometheus/prometheus-simcore.yml
+++ b/services/monitoring/prometheus/prometheus-simcore.yml
@@ -92,7 +92,6 @@ scrape_configs:
       - names:
           - "tasks.production_rabbit"
           - "tasks.staging_rabbit"
-          - "tasks.master_rabbit"
         type: "A"
         port: 15692
       - names:
diff --git a/services/rabbit/docker-compose.node0x.yml.j2 b/services/rabbit/docker-compose.node0x.yml.j2
index 83ac10f63..de2f73a45 100644
--- a/services/rabbit/docker-compose.node0x.yml.j2
+++ b/services/rabbit/docker-compose.node0x.yml.j2
@@ -18,6 +18,9 @@ services:
           memory: "1G"
       update_config:
         order: "stop-first"
+      labels:
+        - prometheus-job=rabbit
+        - prometheus-port=15692
     environment:
       # https://www.rabbitmq.com/docs/configure#supported-environment-variables
       RABBITMQ_DEFAULT_USER: ${RABBIT_USER}
@@ -44,6 +47,7 @@ services:
       - rabbit0{{ NODE_INDEX }}_data:/var/lib/rabbitmq
     networks:
       - rabbit
+      - monitored
     healthcheck:
       # see https://hub.docker.com/_/rabbitmq#healthlivenessreadiness-checking
       # https://www.rabbitmq.com/docs/clustering#restarting-readiness-probes
@@ -65,6 +69,9 @@ networks:
   rabbit:
     name: ${RABBIT_NETWORK}
     external: true
+  monitored:
+    name: ${MONITORED_NETWORK}
+    external: true
 
 configs:
   rabbitmq.conf:
diff --git a/services/rabbit/template.env b/services/rabbit/template.env
index 45093877a..b1a0a01b2 100644
--- a/services/rabbit/template.env
+++ b/services/rabbit/template.env
@@ -12,4 +12,5 @@ RABBIT_LB_REPLICAS=${RABBIT_LB_REPLICAS}
 RABBIT_NETWORK=${RABBIT_NETWORK}
 
 PUBLIC_NETWORK=${PUBLIC_NETWORK}
+MONITORED_NETWORK=${MONITORED_NETWORK}
 MONITORING_DOMAIN=${MONITORING_DOMAIN}