Merge remote-tracking branch 'upstream/master' into merge-branch

Change-Id: Iaf98d962782f065f6ab383b914ebb05cdbf4771d
This commit is contained in:
Simon Pasquier 2016-11-18 11:42:00 +01:00
commit d2a3f4e765

View File

@ -20,7 +20,7 @@ check:
subscribers:
- local-cinder-volume
remote_openstack_cinder_api:
command: "PATH=$PATH:/usr/local/bin oschecks-check_cinder_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:/etc/sensu/plugins check_cinder_api.sh -u :::openstack.user::: -p :::openstack.password::: -t :::openstack.tenant::: -h 'http://:::openstack.host:::' -w 10"
interval: 60
occurrences: 1
subscribers: