diff --git a/rabbitmq/meta/sensu.yml b/rabbitmq/meta/sensu.yml
index 125bff1..05d4e1b 100644
--- a/rabbitmq/meta/sensu.yml
+++ b/rabbitmq/meta/sensu.yml
@@ -21,43 +21,41 @@
     - {{ network.fqdn|replace('.', '-') }}
 {%- else %}
   remote_rabbitmq_server_tcp_{{ network.fqdn }}:
-    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_tcp -H {% if grains.ipv4[0] == '127.0.0.1' %}{{ grains.ipv4[1] }}{% else %}{{ grains.ipv4[0] }}{% endif %} -p 5672"
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_tcp -H {% if grains.ipv4[1] == '127.0.0.1' %}{{ grains.ipv4[0] }}{% else %}{{ grains.ipv4[1] }}{% endif %} -p 5672"
     interval: 60
     occurrences: 1
     subscribers:
     - remote-network
 {%- endif %}
-{#
-remote_rabbitmq_alive_{{ address }}:
+local_rabbitmq_alive_{{ address }}:
   command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-amqp-alive.rb -w {{ address }}"
   interval: 60
   occurrences: 1
   subscribers:
-  - remote-network
-remote_rabbitmq_mistral_alive:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-amqp-alive.rb -w {{ address }} -v %2Fmistral -u mistral --password {{ server.admin.password }}"
+  - local-rabbitmq-server
+local_rabbitmq_eva_diag_{{ address }}:
+  command: "PATH=$PATH:/etc/sensu/plugins check_rabbitmq_stuck_nodes.sh"
   interval: 60
   occurrences: 1
   subscribers:
-  - remote-network
-remote_rabbitmq_murano_alive:
-  command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-amqp-alive.rb -w {{ address }} -v %2Fmurano -u murano --password {{ server.admin.password }}"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - remote-network
+  - local-rabbitmq-server
+
+{# 
+
 remote_rabbitmq_openstack_alive:
   command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-amqp-alive.rb -w {{ address }} -v %2Fopenstack -u {{ server.admin.name }} --password {{ server.admin.password }}"
   interval: 60
   occurrences: 1
   subscribers:
   - remote-network
+{%- if pillar.nova.compute is defined %}
 remote_rabbitmq_metrics_compute:
   command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-queue-metrics.rb --host {{ address }} --user {{ server.admin.name }} --password {{ server.admin.password }} --filter compute"
   interval: 60
   occurrences: 1
   subscribers:
   - remote-network
+{%- endif %}
 remote_rabbitmq_metrics_scheduler:
   command: "PATH=$PATH:/etc/sensu/plugins rabbitmq-queue-metrics.rb --host {{ address }} --user {{ server.admin.name }} --password {{ server.admin.password }} --filter scheduler"
   interval: 60