diff --git a/glusterfs/meta/sensu.yml b/glusterfs/meta/sensu.yml
index 5fb147e..99c4c3e 100644
--- a/glusterfs/meta/sensu.yml
+++ b/glusterfs/meta/sensu.yml
@@ -16,17 +16,17 @@
     occurrences: 1
     subscribers:
     - {{ grains['fqdn']|replace('.', '-') }}
-  local_glusterfsd_proc_{{ volume_name }}_{{ grains['fqdn'] }}:
+{%- endfor %}
+  local_glusterfsd_proc_{{ 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:
     - {{ grains['fqdn']|replace('.', '-') }}
-  local_glusterfs_proc_{{ volume_name }}_{{ grains['fqdn'] }}:
+  local_glusterfs_proc_{{ 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
     subscribers:
     - {{ grains['fqdn']|replace('.', '-') }}
-{%- endfor %}
 {%- endif %}