diff --git a/glusterfs/map.jinja b/glusterfs/map.jinja
index dd56247..6512291 100644
--- a/glusterfs/map.jinja
+++ b/glusterfs/map.jinja
@@ -1,10 +1,10 @@
 {% set server = salt['grains.filter_by']({
     'Debian': {
-        'pkgs': ['glusterfs-server'],
+        'pkgs': ['glusterfs-server','bc'],
         'service': 'glusterfs-server',
     },
     'RedHat': {
-        'pkgs': ['glusterfs-server'],
+        'pkgs': ['glusterfs-server','bc'],
         'service': 'glusterd',
     },
 }, merge=salt['pillar.get']('glusterfs:server')) %}
diff --git a/glusterfs/meta/sensu.yml b/glusterfs/meta/sensu.yml
index 1f4e3a7..1bfc35f 100644
--- a/glusterfs/meta/sensu.yml
+++ b/glusterfs/meta/sensu.yml
@@ -1,8 +1,11 @@
 {%- from "linux/map.jinja" import network with context -%}
+{%- from "glusterfs/map.jinja" import server with context -%}
 check:
+{%- for volume_name in server.get('volumes', {}).iterkeys() %}
   local_glusterfs_status_{{ network.fqdn }}::
-    command: "PATH=$PATH:/etc/sensu/plugins check_glusterfs -v glance -n 3 -w 50 -c 30"
+    command: "PATH=$PATH:/etc/sensu/plugins check_glusterfs -v {{ volume_name }} -n 3 -w 50 -c 30"
     interval: 60
     occurrences: 1
     subscribers:
-    - local-glusterfs-server
\ No newline at end of file
+    - local-glusterfs-server
+{%- endfor %}
\ No newline at end of file