diff --git a/ceilometer/files/heka.toml b/ceilometer/files/heka.toml
new file mode 100644
index 0000000..a96b26e
--- /dev/null
+++ b/ceilometer/files/heka.toml
@@ -0,0 +1,15 @@
+{%- if pillar.ceilometer.server is defined %}
+[logstreamer_ceilometer]
+type = "LogstreamerInput"
+log_directory = "/var/log/ceilometer"
+file_match = '(?P<Service>.+)\.log\.?(?P<Seq>\d*)$'
+differentiator = ["'ceilometer','_','Service'"]
+priority = ["^Index"]
+decoder = "openstack"
+
+[openstack]
+type = "SandboxDecoder"
+filename = "lua_modules/decoders/openstack.lua"
+module_directory = "/usr/share/heka/lua_modules;/usr/share/heka/lua_modules/common"
+
+{% endif %}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index dd2c37d..dc6c05b 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -4,7 +4,7 @@
       collectd:
         enabled: false
       heka:
-        enabled: false
+        enabled: true
       sensu:
         enabled: false
       sphinx: