diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index 06f9734564..2bacdd33cf 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -253,9 +253,12 @@
     mode: 0644
   with_items:
   - check_rabbitmq_server.cfg
+  - check_rabbitmq_watermark.cfg
   - check_rabbitmq_cluster.cfg
   - check_rabbitmq_connections.cfg
   - check_rabbitmq_overview.cfg
+  - check_rabbitmq_exchange.cfg
+  - check_rabbitmq_queue.cfg
   when: inventory_hostname.startswith('rabbitmq')
   notify:
   - restart nrpe
diff --git a/roles/nagios_client/templates/check_rabbitmq_exchange.cfg.j2 b/roles/nagios_client/templates/check_rabbitmq_exchange.cfg.j2
new file mode 100644
index 0000000000..c5a729e42e
--- /dev/null
+++ b/roles/nagios_client/templates/check_rabbitmq_exchange.cfg.j2
@@ -0,0 +1,2 @@
+command[check_rabbitmq_exchange_pubsub]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_exchange --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini --vhost /pubsub --exchange amq.topic --period 600
+command[check_rabbitmq_exchange_public_pubsub]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_exchange --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini --vhost /public_pubsub --exchange amq.topic --period 600
\ No newline at end of file
diff --git a/roles/nagios_client/templates/check_rabbitmq_queue.cfg.j2 b/roles/nagios_client/templates/check_rabbitmq_queue.cfg.j2
new file mode 100644
index 0000000000..ddce310d0a
--- /dev/null
+++ b/roles/nagios_client/templates/check_rabbitmq_queue.cfg.j2
@@ -0,0 +1,2 @@
+command[check_rabbitmq_queue_pubsub]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_connections --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini --vhost /pubsub
+command[check_rabbitmq_queue_public_pubsub]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_connections --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini --vhost /public_pubsub
\ No newline at end of file
diff --git a/roles/nagios_client/templates/check_rabbitmq_watermark.cfg.j2 b/roles/nagios_client/templates/check_rabbitmq_watermark.cfg.j2
new file mode 100644
index 0000000000..3dc965b8a0
--- /dev/null
+++ b/roles/nagios_client/templates/check_rabbitmq_watermark.cfg.j2
@@ -0,0 +1 @@
+command[check_rabbitmq_watermark]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_watermark --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini --vhost /pubsub --node={{ inventory_hostname }}
\ 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 ff9f62d8c0..2078d3e1b9 100644
--- a/roles/nagios_server/files/nagios/services/rabbitmq.cfg
+++ b/roles/nagios_server/files/nagios/services/rabbitmq.cfg
@@ -1,3 +1,5 @@
+# RabbitMQ processes (for each host)
+
 define service {
   host_name             rabbitmq01.phx2.fedoraproject.org
   service_description   Check bus server processes
@@ -19,6 +21,29 @@ define service {
   use                   defaulttemplate
 }
 
+# RabbitMQ alarms (for each host)
+
+define service {
+  host_name             rabbitmq01.phx2.fedoraproject.org
+  service_description   Check bus server alarms
+  check_command         check_by_nrpe!check_rabbitmq_watermark
+  use                   defaulttemplate
+}
+
+define service {
+  host_name             rabbitmq02.phx2.fedoraproject.org
+  service_description   Check bus server alarms
+  check_command         check_by_nrpe!check_rabbitmq_watermark
+  use                   defaulttemplate
+}
+
+define service {
+  host_name             rabbitmq03.phx2.fedoraproject.org
+  service_description   Check bus server alarms
+  check_command         check_by_nrpe!check_rabbitmq_watermark
+  use                   defaulttemplate
+}
+
 # The following results are cluster-wide, no need to run them on each cluster member
 
 define service {
@@ -40,4 +65,32 @@ define service {
   service_description   Check bus cluster overview
   check_command         check_by_nrpe!check_rabbitmq_overview
   use                   defaulttemplate
+}
+
+define service {
+  host_name             rabbitmq01.phx2.fedoraproject.org
+  service_description   Check bus exchanges in /pubsub
+  check_command         check_by_nrpe!check_rabbitmq_exchange_pubsub
+  use                   defaulttemplate
+}
+
+define service {
+  host_name             rabbitmq01.phx2.fedoraproject.org
+  service_description   Check bus exchanges in /public_pubsub
+  check_command         check_by_nrpe!check_rabbitmq_exchange_public_pubsub
+  use                   defaulttemplate
+}
+
+define service {
+  host_name             rabbitmq01.phx2.fedoraproject.org
+  service_description   Check bus queues in /pubsub
+  check_command         check_by_nrpe!check_rabbitmq_queue_pubsub
+  use                   defaulttemplate
+}
+
+define service {
+  host_name             rabbitmq01.phx2.fedoraproject.org
+  service_description   Check bus queues in /public_pubsub
+  check_command         check_by_nrpe!check_rabbitmq_queue_public_pubsub
+  use                   defaulttemplate
 }
\ No newline at end of file