diff --git a/haproxy/files/collectd_haproxy.conf b/haproxy/files/collectd_haproxy.conf
new file mode 100644
index 0000000..8c08f18
--- /dev/null
+++ b/haproxy/files/collectd_haproxy.conf
@@ -0,0 +1,29 @@
+Import "haproxy"
+
+<Module "haproxy">
+    Mapping "contrail_analytics" "contrail-analytics"
+    Mapping "contrail_api" "contrail-api"
+    Mapping "contrail_discovery" "contrail-discovery"
+
+    Mapping "mysql_cluster" "mysql"
+
+    Mapping "cinder_api" "cinder-api"
+    Mapping "glance_api" "glance-api"
+    Mapping "glance_registry" "glance-registry-api"
+    Mapping "heat_api" "heat-api"
+    Mapping "heat_api_cfn" "heat-cfn-api"
+    Mapping "heat_api_cloudwatch" "heat-cloudwatch-api"
+    Mapping "horizon_web" "horizon-web"
+    Mapping "keystone_admin" "keystone-admin-api"
+    Mapping "keystone_auth" "keystone-public-api"
+    Mapping "nova_metadata" "nova-metadata-api"
+    Mapping "nova_ec2_api" "nova-ec2-api"
+    Mapping "nova_openstack_api" "nova-api"
+    Mapping "neutron_api" "neutron-api"
+
+    ProxyIgnore "rabbitmq_cluster"
+    ProxyIgnore "contrail_collector_stats"
+    ProxyIgnore "contrail_config_stats"
+
+    Socket "{{ plugin.socket }}"
+</Module>
diff --git a/haproxy/meta/collectd.yml b/haproxy/meta/collectd.yml
new file mode 100644
index 0000000..7dad1b2
--- /dev/null
+++ b/haproxy/meta/collectd.yml
@@ -0,0 +1,9 @@
+{%- from "haproxy/map.jinja" import proxy with context %}
+{%- if proxy.enabled %}
+local_plugin:
+  haproxy:
+    plugin: python
+    template: haproxy/files/collectd_haproxy.conf
+    socket: {{ proxy.stats_socket }}
+{%- endif %}
+
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 6642bee..5376c55 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -2,7 +2,7 @@
   haproxy:
     _support:
       collectd:
-        enabled: false
+        enabled: true
       heka:
         enabled: false
       sensu: