From 33e777f8d853e798be37af753e9adbd7a62f0939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Thu, 8 Aug 2019 17:21:07 +0200
Subject: [PATCH] Improve RabbitMQ stats
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 playbooks/groups/rabbitmq.yml                              | 4 +++-
 .../collectd/rabbitmq/templates/rabbitmq.collectd.conf.j2  | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/playbooks/groups/rabbitmq.yml b/playbooks/groups/rabbitmq.yml
index 517c15a59a..43df0534ae 100644
--- a/playbooks/groups/rabbitmq.yml
+++ b/playbooks/groups/rabbitmq.yml
@@ -20,7 +20,9 @@
   - hosts
   - fas_client
   - collectd/base
-  - collectd/rabbitmq
+  # RabbitMQ statistics are cluster-wide, only collect them on one member
+  - role: collectd/rabbitmq
+    when: inventory_hostname.startswith('rabbitmq03')
   - rsyncd
   - sudo
   - rabbitmq_cluster
diff --git a/roles/collectd/rabbitmq/templates/rabbitmq.collectd.conf.j2 b/roles/collectd/rabbitmq/templates/rabbitmq.collectd.conf.j2
index 52d0246d71..e3cd968696 100644
--- a/roles/collectd/rabbitmq/templates/rabbitmq.collectd.conf.j2
+++ b/roles/collectd/rabbitmq/templates/rabbitmq.collectd.conf.j2
@@ -4,11 +4,14 @@ LoadPlugin python
   Interactive false
   Import "collectd_rabbitmq.collectd_plugin"
   <Module "collectd_rabbitmq.collectd_plugin">
-
     Username "nagios-monitoring"
     Password "{{ (env == 'production')|ternary(rabbitmq_monitoring_password_production, rabbitmq_monitoring_password_staging) }}"
     Realm "RabbitMQ Management"
     Host "localhost"
     Port "15672"
+    Ignore "^federation:"
+    {% if env != 'production' %}
+    VHostPrefix "stg_"
+    {% endif %}
   </Module>
-</Plugin>
\ No newline at end of file
+</Plugin>