enable sensu monitoring, update ceilometer checks

Change-Id: I165b0d30e1abe188896e589b32a84db9c6db0011

ceilometer/meta/sensu.yml

@@ -1,6 +1,8 @@
+{%- from "ceilometer/map.jinja" import server with context %}
+
 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"
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/ceilometer-polling' -u ceilometer -c 1:1"
     interval: 60
     occurrences: 1
     subscribers:
@@ -23,12 +25,6 @@ check:
     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
@@ -42,8 +38,14 @@ check:
     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"
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -a '/usr/bin/ceilometer-polling' -u ceilometer -c 1:1"
     interval: 60
     occurrences: 1
     subscribers:
-    - local-ceilometer-server
+    - local-ceilometer-server
+  remote_ceilometer_api:
+    command: "PATH=$PATH:/etc/sensu/plugins check_ceilometer-api -H http://:::openstack.host:::::::openstack.port:::/v2.0 -U :::openstack.user::: -T :::openstack.tenant::: -P :::openstack.password::: -R {{ server.region }}"
+    interval: 300
+    occurrences: 1
+    subscribers:
+    - remote-network

metadata/service/support.yml

@@ -6,6 +6,6 @@ parameters:
       heka:
         enabled: true
       sensu:
-        enabled: false
+        enabled: true
       sphinx:
         enabled: true