diff --git a/heat/meta/collectd.yml b/heat/meta/collectd.yml
new file mode 100644
index 0000000..f1a8d2a
--- /dev/null
+++ b/heat/meta/collectd.yml
@@ -0,0 +1,14 @@
+{%- if pillar.heat.server is defined %}
+{%- from "heat/map.jinja" import server with context %}
+{%- if server.get('enabled', False) %}
+local_plugin:
+  collectd_check_local_endpoint:
+    endpoint:
+      heat-api:
+        expected_code: 300
+        url: "http://{{ server.bind.api|replace('0.0.0.0', '127.0.0.1') }}:8004/"
+      heat-cfn-api:
+        expected_code: 300
+        url: "http://{{ server.bind.api_cfn|replace('0.0.0.0', '127.0.0.1') }}:8000/"
+{%- endif %}
+{%- endif %}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 43b2661..697d85c 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -2,7 +2,7 @@
   heat:
     _support:
       collectd:
-        enabled: false
+        enabled: true
       heka:
         enabled: true
       sensu: