diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index 7a904dd05f..06f9734564 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -253,6 +253,9 @@
     mode: 0644
   with_items:
   - check_rabbitmq_server.cfg
+  - check_rabbitmq_cluster.cfg
+  - check_rabbitmq_connections.cfg
+  - check_rabbitmq_overview.cfg
   when: inventory_hostname.startswith('rabbitmq')
   notify:
   - restart nrpe
diff --git a/roles/nagios_client/templates/check_rabbitmq_cluster.cfg.j2 b/roles/nagios_client/templates/check_rabbitmq_cluster.cfg.j2
new file mode 100644
index 0000000000..6a67248166
--- /dev/null
+++ b/roles/nagios_client/templates/check_rabbitmq_cluster.cfg.j2
@@ -0,0 +1 @@
+command[check_rabbitmq_cluster]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_cluster --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini -n rabbit@rabbitmq01.phx2.fedoraproject.org,rabbit@rabbitmq02.phx2.fedoraproject.org,rabbit@rabbitmq03.phx2.fedoraproject.org
\ No newline at end of file
diff --git a/roles/nagios_client/templates/check_rabbitmq_connections.cfg.j2 b/roles/nagios_client/templates/check_rabbitmq_connections.cfg.j2
new file mode 100644
index 0000000000..8b30a7ff35
--- /dev/null
+++ b/roles/nagios_client/templates/check_rabbitmq_connections.cfg.j2
@@ -0,0 +1 @@
+command[check_rabbitmq_connections]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_connections --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini
\ No newline at end of file
diff --git a/roles/nagios_client/templates/check_rabbitmq_overview.cfg.j2 b/roles/nagios_client/templates/check_rabbitmq_overview.cfg.j2
new file mode 100644
index 0000000000..060fb2fab5
--- /dev/null
+++ b/roles/nagios_client/templates/check_rabbitmq_overview.cfg.j2
@@ -0,0 +1 @@
+command[check_rabbitmq_overview]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_overview --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini
\ No newline at end of file
diff --git a/roles/nagios_client/templates/check_rabbitmq_server.cfg.j2 b/roles/nagios_client/templates/check_rabbitmq_server.cfg.j2
index 501c0c03e3..bc8fb20534 100644
--- a/roles/nagios_client/templates/check_rabbitmq_server.cfg.j2
+++ b/roles/nagios_client/templates/check_rabbitmq_server.cfg.j2
@@ -1 +1 @@
-command[check_nrpe_check_rabbitmq_server]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_server --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini
\ No newline at end of file
+command[check_rabbitmq_server]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_server --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini --node={{ inventory_hostname }}
\ No newline at end of file
diff --git a/roles/nagios_client/templates/rabbitmq_args.ini.j2 b/roles/nagios_client/templates/rabbitmq_args.ini.j2
index 6f3f79c3e7..ee3078d701 100644
--- a/roles/nagios_client/templates/rabbitmq_args.ini.j2
+++ b/roles/nagios_client/templates/rabbitmq_args.ini.j2
@@ -1,5 +1,4 @@
 [common]
 hostname = localhost
 username = nagios-monitoring
-password = {{ (env == 'production')|ternary(rabbitmq_monitoring_password_production, rabbitmq_monitoring_password_staging) }}
-node = {{ inventory_hostname }}
\ No newline at end of file
+password = {{ (env == 'production')|ternary(rabbitmq_monitoring_password_production, rabbitmq_monitoring_password_staging) }}
\ No newline at end of file
diff --git a/roles/nagios_server/files/nagios/services/rabbitmq.cfg b/roles/nagios_server/files/nagios/services/rabbitmq.cfg
index 0d33701728..ff9f62d8c0 100644
--- a/roles/nagios_server/files/nagios/services/rabbitmq.cfg
+++ b/roles/nagios_server/files/nagios/services/rabbitmq.cfg
@@ -1,6 +1,43 @@
 define service {
   host_name             rabbitmq01.phx2.fedoraproject.org
   service_description   Check bus server processes
-  check_command         check_by_nrpe!check_nrpe_check_rabbitmq_server
+  check_command         check_by_nrpe!check_rabbitmq_server
+  use                   defaulttemplate
+}
+
+define service {
+  host_name             rabbitmq02.phx2.fedoraproject.org
+  service_description   Check bus server processes
+  check_command         check_by_nrpe!check_rabbitmq_server
+  use                   defaulttemplate
+}
+
+define service {
+  host_name             rabbitmq03.phx2.fedoraproject.org
+  service_description   Check bus server processes
+  check_command         check_by_nrpe!check_rabbitmq_server
+  use                   defaulttemplate
+}
+
+# The following results are cluster-wide, no need to run them on each cluster member
+
+define service {
+  host_name             rabbitmq01.phx2.fedoraproject.org
+  service_description   Check bus cluster
+  check_command         check_by_nrpe!check_rabbitmq_cluster
+  use                   defaulttemplate
+}
+
+define service {
+  host_name             rabbitmq01.phx2.fedoraproject.org
+  service_description   Check bus cluster connections
+  check_command         check_by_nrpe!check_rabbitmq_connections
+  use                   defaulttemplate
+}
+
+define service {
+  host_name             rabbitmq01.phx2.fedoraproject.org
+  service_description   Check bus cluster overview
+  check_command         check_by_nrpe!check_rabbitmq_overview
   use                   defaulttemplate
 }
\ No newline at end of file