diff --git a/grafana/meta/sensu.yml b/grafana/meta/sensu.yml
new file mode 100644
index 0000000..3f3e6da
--- /dev/null
+++ b/grafana/meta/sensu.yml
@@ -0,0 +1,7 @@
+check:
+  local_grafana_server_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C grafana-server -u grafana -c 1:1"
+    interval: 30
+    occurences: 3
+    subscribers:
+    - local-grafana-server
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 05bf4b8..3bd2dd1 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -6,7 +6,7 @@ parameters:
       heka:
         enabled: false
       sensu:
-        enabled: false
+        enabled: true
       sphinx:
         enabled: true
       grafana: