diff --git a/grafana/meta/collectd.yml b/grafana/meta/collectd.yml
new file mode 100644
index 0000000..55b7678
--- /dev/null
+++ b/grafana/meta/collectd.yml
@@ -0,0 +1,10 @@
+{%- if pillar.grafana.server is defined %}
+{%- from "grafana/map.jinja" import server with context %}
+
+{%- if server.get('enabled', False) %}
+local_plugin:
+  collectd_processes:
+    process:
+      grafana-server: {}
+{%- endif %}
+{%- endif %}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 0d44256..2bcd975 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -2,7 +2,7 @@
   grafana:
     _support:
       collectd:
-        enabled: false
+        enabled: true
       heka:
         enabled: false
       sensu: