diff --git a/ceilometer/meta/sensu.yml b/ceilometer/meta/sensu.yml
new file mode 100644
index 0000000..1616e82
--- /dev/null
+++ b/ceilometer/meta/sensu.yml
@@ -0,0 +1,49 @@
+check:
+  local_ceilometer_agent_compute_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/ceilometer-agent-compute' -u ceilometer -c 1:1"
+    interval: 60
+    occurrences: 1
+    subscribers:
+    - local-ceilometer-agent
+  local_ceilometer_collector_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/ceilometer-collector' -u ceilometer -c 1:3"
+    interval: 60
+    occurrences: 1
+    subscribers:
+    - local-ceilometer-server
+  local_ceilometer_alarm_notifier_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/ceilometer-alarm-notifier' -u ceilometer -c 1:1"
+    interval: 60
+    occurrences: 1
+    subscribers:
+    - local-ceilometer-server
+  local_ceilometer_api_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/ceilometer-api' -u ceilometer -c 1:1"
+    interval: 60
+    occurrences: 1
+    subscribers:
+    - local-ceilometer-server
+  local_ceilometer_collector_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/ceilometer-collector' -u ceilometer -c 1:3"
+    interval: 60
+    occurrences: 1
+    subscribers:
+    - local-ceilometer-server
+  local_ceilometer_alarm_evaluator_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/ceilometer-alarm-evaluator' -u ceilometer -c 1:1"
+    interval: 60
+    occurrences: 1
+    subscribers:
+    - local-ceilometer-server
+  local_ceilometer_agent_notification_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/ceilometer-agent-notification' -u ceilometer -c 1:3"
+    interval: 60
+    occurrences: 1
+    subscribers:
+    - local-ceilometer-server
+  local_ceilometer_agent_central_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/ceilometer-agent-central' -u ceilometer -c 1:1"
+    interval: 60
+    occurrences: 1
+    subscribers:
+    - local-ceilometer-server
\ No newline at end of file
diff --git a/ceilometer/meta/sphinx.yml b/ceilometer/meta/sphinx.yml
index 406528a..0359826 100644
--- a/ceilometer/meta/sphinx.yml
+++ b/ceilometer/meta/sphinx.yml
@@ -3,12 +3,52 @@
   description: The ceilometer project aims to deliver a unique point of contact for billing systems to acquire all of the measurements they need to establish customer billing, across all current OpenStack core components with work underway to support future OpenStack components.
   role:
   {%- if pillar.ceilometer.agent is defined %}
+  {%- from "ceilometer/map.jinja" import agent with context %}
     agent:
       name: agent
-      param: {}
+      param:
+        version:
+          name: "Version"
+          value: {{ agent.version }}
+        packages:
+          value: |
+            {%- for pkg in agent.pkgs %}
+            {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
+            * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+            {%- endfor %}
   {%- endif %}
   {%- if pillar.ceilometer.server is defined %}
+  {%- from "ceilometer/map.jinja" import server with context %}
     server:
       name: server
-      param: {}
-  {%- endif %}
+      endpoint:
+        glance_api:
+          name: ceilometer-api
+          type: ceilometer-api
+          address: http://{{ server.bind.host }}:{{ server.bind.port }}
+          protocol: http
+      param:
+        bind:
+          value: {{ server.bind.host }}:{{ server.bind.port }}
+        ttl:
+          name: "Time to live for ceilometer metrics"
+          value: {{ server.ttl }}
+        version:
+          name: "Version"
+          value: {{ server.version }}
+        database_host:
+          name: "Database"
+          value: {{ server.database.user }}@{{ server.database.host }}:27017/{{ server.database.name }}
+        message_queue_ip:
+          name: "Message queue"
+          value: {{ server.message_queue.user }}@{{ server.message_queue.host }}:{{ server.message_queue.port }}{{ server.message_queue.virtual_host }}
+        identity_host:
+          name: "Identity service"
+          value: {{ server.identity.user }}@{{ server.identity.host }}:{{ server.identity.port }}
+        packages:
+          value: |
+            {%- for pkg in server.pkgs %}
+            {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
+            * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+            {%- endfor %}
+  {%- endif %}
\ No newline at end of file