Skip to content

Commit 25d2a68

Browse files
authored
Prometheus: scrape RabbitMQ Cluster (#1218)
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 * #1176
1 parent 2f9f69f commit 25d2a68

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

services/monitoring/prometheus/prometheus-simcore.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ scrape_configs:
9292
- names:
9393
- "tasks.production_rabbit"
9494
- "tasks.staging_rabbit"
95-
- "tasks.master_rabbit"
9695
type: "A"
9796
port: 15692
9897
- names:

services/rabbit/docker-compose.node0x.yml.j2

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ services:
1818
memory: "1G"
1919
update_config:
2020
order: "stop-first"
21+
labels:
22+
- prometheus-job=rabbit
23+
- prometheus-port=15692
2124
environment:
2225
# https://www.rabbitmq.com/docs/configure#supported-environment-variables
2326
RABBITMQ_DEFAULT_USER: ${RABBIT_USER}
@@ -44,6 +47,7 @@ services:
4447
- rabbit0{{ NODE_INDEX }}_data:/var/lib/rabbitmq
4548
networks:
4649
- rabbit
50+
- monitored
4751
healthcheck:
4852
# see https://hub.docker.com/_/rabbitmq#healthlivenessreadiness-checking
4953
# https://www.rabbitmq.com/docs/clustering#restarting-readiness-probes
@@ -65,6 +69,9 @@ networks:
6569
rabbit:
6670
name: ${RABBIT_NETWORK}
6771
external: true
72+
monitored:
73+
name: ${MONITORED_NETWORK}
74+
external: true
6875

6976
configs:
7077
rabbitmq.conf:

services/rabbit/template.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ RABBIT_LB_REPLICAS=${RABBIT_LB_REPLICAS}
1212
RABBIT_NETWORK=${RABBIT_NETWORK}
1313

1414
PUBLIC_NETWORK=${PUBLIC_NETWORK}
15+
MONITORED_NETWORK=${MONITORED_NETWORK}
1516
MONITORING_DOMAIN=${MONITORING_DOMAIN}

0 commit comments

Comments
 (0)