add region to checks
Change-Id: Ia6d31ae1fe8459f946257512b13857364f50d010
diff --git a/nova/meta/sensu.yml b/nova/meta/sensu.yml
index 9c6ee7e..6c9114d 100644
--- a/nova/meta/sensu.yml
+++ b/nova/meta/sensu.yml
@@ -1,3 +1,12 @@
+{%- from "nova/map.jinja" import controller with context %}
+{%- from "nova/map.jinja" import compute with context %}
+{%- if pillar.nova.controller is defined %}
+{%- set region = controller.identity.region %}
+{%- endif %}
+{%- if pillar.nova.compute is defined %}
+{%- set region = compute.identity.region %}
+{%- endif %}
+
check:
local_nova_api_proc:
command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C nova-api -u nova -c 1:1024"
@@ -54,13 +63,13 @@
subscribers:
- remote-network
remote_openstack_nova_api:
- command: "PATH=$PATH:/usr/local/bin oschecks-check_nova_api --os-auth-url 'http://:::openstack.host:::::::openstack.port:::/v2.0' --os-username :::openstack.user::: --os-password :::openstack.password::: --os-tenant-name :::openstack.tenant:::"
+ command: "PATH=$PATH:/usr/local/bin oschecks-check_nova_api --os-auth-url 'http://:::openstack.host:::::::openstack.port:::/v2.0' --os-username :::openstack.user::: --os-password :::openstack.password::: --os-tenant-name :::openstack.tenant::: --os-region-name {{ region }}"
interval: 60
occurrences: 1
subscribers:
- remote-network
remote_nova_services:
- command: "PATH=$PATH:/etc/sensu/plugins check_nova_services.sh -u :::openstack.user::: -p :::openstack.password::: -t :::openstack.tenant::: -h 'http://:::openstack.host:::::::openstack.port:::/v2.0'"
+ command: "PATH=$PATH:/etc/sensu/plugins check_nova_services.sh -u :::openstack.user::: -p :::openstack.password::: -t :::openstack.tenant::: -h 'http://:::openstack.host:::::::openstack.port:::/v2.0' -r {{ region }}"
interval: 60
occurrences: 1
subscribers: