x
/
fuel-plugin-lma-collector
Code Issues Proposed changes

Update expected value for OpenStack HTTP checks 

This patch allows to specify a list of expected values when checking
the OpenStack API.

Change-Id: I3cad004171ade1bda3c968ffb75412698b728d9c
Closes-Bug: #1557384
This commit is contained in:
Guillaume Thouvenin 2016-03-15 10:18:55 +01:00
parent a9fdabb520
commit e8f94e8dca
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
deployment_scripts/puppet/modules/lma_collector/files/collectd/check_openstack_api.py
View File

@ -31,21 +31,23 @@ class APICheckPlugin(openstack.CollectdPlugin):
# TODO(all): sahara, murano
CHECK_MAP = {
'keystone': {
'path': '/', 'expect': 300, 'name': 'keystone-public-api'},
'heat': {'path': '/', 'expect': 300, 'name': 'heat-api'},
'heat-cfn': {'path': '/', 'expect': 300, 'name': 'heat-cfn-api'},
'glance': {'path': '/', 'expect': 300, 'name': 'glance-api'},
'cinder': {'path': '/', 'expect': 200, 'name': 'cinder-api'},
'cinderv2': {'path': '/', 'expect': 200, 'name': 'cinder-v2-api'},
'neutron': {'path': '/', 'expect': 200, 'name': 'neutron-api'},
'nova': {'path': '/', 'expect': 200, 'name': 'nova-api'},
'path': '/', 'expect': [300], 'name': 'keystone-public-api'},
'heat': {'path': '/', 'expect': [300], 'name': 'heat-api'},
'heat-cfn': {'path': '/', 'expect': [300], 'name': 'heat-cfn-api'},
'glance': {'path': '/', 'expect': [300], 'name': 'glance-api'},
# Since Mitaka, Cinder returns 300 instead of 200 in previous releases
'cinder': {'path': '/', 'expect': [200, 300], 'name': 'cinder-api'},
'cinderv2': {
'path': '/', 'expect': [200, 300], 'name': 'cinder-v2-api'},
'neutron': {'path': '/', 'expect': [200], 'name': 'neutron-api'},
'nova': {'path': '/', 'expect': [200], 'name': 'nova-api'},
# Ceilometer requires authentication for all paths
'ceilometer': {
'path': 'v2/capabilities', 'expect': 200, 'auth': True,
'path': 'v2/capabilities', 'expect': [200], 'auth': True,
'name': 'ceilometer-api'},
'swift': {'path': 'healthcheck', 'expect': 200, 'name': 'swift-api'},
'swift': {'path': 'healthcheck', 'expect': [200], 'name': 'swift-api'},
'swift_s3': {
'path': 'healthcheck', 'expect': 200, 'name': 'swift-s3-api'},
'path': 'healthcheck', 'expect': [200], 'name': 'swift-s3-api'},
}
def _service_url(self, endpoint, path):
@ -73,7 +75,7 @@ class APICheckPlugin(openstack.CollectdPlugin):
url = self._service_url(service['url'], check['path'])
r = self.raw_get(url, token_required=check.get('auth', False))
if r is None or r.status_code != check['expect']:
if r is None or r.status_code not in check['expect']:
def _status(ret):
return 'N/A' if r is None else r.status_code