diff --git a/kibana/meta/collectd.yml b/kibana/meta/collectd.yml
new file mode 100644
index 0000000..b94e8e1
--- /dev/null
+++ b/kibana/meta/collectd.yml
@@ -0,0 +1,11 @@
+{%- if pillar.kibana.server is defined %}
+{%- from "kibana/map.jinja" import server with context %}
+
+{%- if server.get('enabled', False) %}
+local_plugin:
+  collectd_processes:
+    process:
+      kibana:
+        match: 'node.*kibana'
+{%- endif %}
+{%- endif %}
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index fd6d447..3ca67fc 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -1,5 +1,7 @@
 applications:
 - kibana
+classes:
+- service.kibana.support
 parameters:
   kibana:
     server:
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 86aa163..b1735ad 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -2,7 +2,7 @@
   kibana:
     _support:
       collectd:
-        enabled: false
+        enabled: true
       heka:
         enabled: false
       sensu: