diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 68d216d..e757a90 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -2,7 +2,7 @@
   rabbitmq:
     _support:
       collectd:
-        enabled: false
+        enabled: true
       heka:
         enabled: false
       sensu:
diff --git a/rabbitmq/files/collectd_rabbitmq.conf b/rabbitmq/files/collectd_rabbitmq.conf
new file mode 100644
index 0000000..70aa668
--- /dev/null
+++ b/rabbitmq/files/collectd_rabbitmq.conf
@@ -0,0 +1,24 @@
+LoadPlugin python
+<Plugin python>
+
+  ModulePath "/usr/lib/collectd-plugins/"
+  LogTraces true
+  Interactive false
+  Import rabbitmq
+
+  <Module rabbitmq>
+
+    Username "guest"
+    Password "guest"
+    Realm "RabbitMQ Management"
+    Host "localhost"
+    Port "15672"
+
+    <Ignore "queue">
+      Regex "amq-gen-.*"
+      Regex "tmp-.*"
+    </Ignore>
+
+  </Module>
+
+</Plugin>
\ No newline at end of file
diff --git a/rabbitmq/meta/collectd.yml b/rabbitmq/meta/collectd.yml
index e69de29..73ffef8 100644
--- a/rabbitmq/meta/collectd.yml
+++ b/rabbitmq/meta/collectd.yml
@@ -0,0 +1,5 @@
+plugin:
+  rabbitmq_server_rabbitmq:
+    plugin: rabbitmq
+    interval: 60
+    template: rabbitmq/files/collectd_rabbitmq.conf
diff --git a/rabbitmq/meta/sphinx.yml b/rabbitmq/meta/sphinx.yml
index 540ee42..8e5caa0 100644
--- a/rabbitmq/meta/sphinx.yml
+++ b/rabbitmq/meta/sphinx.yml
@@ -1,7 +1,30 @@
+{%- from "rabbitmq/map.jinja" import server with context %}
 doc:
   name: rabbitmq
   description: RabbitMQ is a complete and highly reliable enterprise messaging system based on the emerging AMQP standard.
   role:
     server:
       name: server
-      param: {}
+      param:
+        bind:
+          value: {{ server.bind.host }}:{{ server.bind.port }}
+      endpoint:
+        rabbitmq_amqp:
+          name: server
+          type: rabbitmq_amqp
+          address: {{ server.bind.host }}:{{ server.bind.port }}
+          protocol: tcp
+        rabbitmq_admin:
+          name: server
+          type: rabbitmq_admin
+          address: http://{{ server.bind.host }}:15672/
+          protocol: http
+    {%- if pillar.rabbitmq.cluster is defined %}
+    {%- from "rabbitmq/map.jinja" import cluster with context %}
+    cluster:
+      name: server
+      param:
+        members:
+          name: Cluster members
+          value: {{ cluster.members }}
+    {%- endif %}
\ No newline at end of file