diff --git a/glusterfs/meta/sensu.yml b/glusterfs/meta/sensu.yml
index aa1169a..5fb147e 100644
--- a/glusterfs/meta/sensu.yml
+++ b/glusterfs/meta/sensu.yml
@@ -1,7 +1,7 @@
 {%- from "glusterfs/map.jinja" import server with context -%}
 {%- if pillar.glusterfs.server is defined %}
 check:
-  local_glusterd_proc:
+  local_glusterd_proc_{{ grains['fqdn'] }}:
     command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C glusterd -u root -c 1:1"
     interval: 60
     occurrences: 1
@@ -15,14 +15,14 @@
     timeout: 120
     occurrences: 1
     subscribers:
-    - local-glusterfs-server
-  local_glusterfsd_proc:
+    - {{ grains['fqdn']|replace('.', '-') }}
+  local_glusterfsd_proc_{{ volume_name }}_{{ grains['fqdn'] }}:
     command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C glusterfsd -u root -c {{ server.volumes|length }}"
     interval: 60
     occurrences: 1
     subscribers:
-    - local-glusterfs-server
-  local_glusterfs_proc:
+    - {{ grains['fqdn']|replace('.', '-') }}
+  local_glusterfs_proc_{{ volume_name }}_{{ grains['fqdn'] }}:
     command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C glusterfs -u root -c {{ server.volumes|length + 1 }}"
     interval: 60
     occurrences: 1