From e17960ddbabfa6c976de0290756a53c299c44df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=A1gr?= Date: Wed, 16 Aug 2017 15:40:19 +0200 Subject: [PATCH] python-ceilometerclient-2.8.1+ compatibility patch Change-Id: I286137d41573b2b28af63cd34dd67768df1df686 --- monitoring-for-openstack/oschecks/ceilometer.py | 9 +++++---- monitoring-for-openstack/oschecks/utils.py | 5 ----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/monitoring-for-openstack/oschecks/ceilometer.py b/monitoring-for-openstack/oschecks/ceilometer.py index 18ace02..2f23a13 100644 --- a/monitoring-for-openstack/oschecks/ceilometer.py +++ b/monitoring-for-openstack/oschecks/ceilometer.py @@ -22,7 +22,7 @@ import json import re from oschecks import utils -from ceilometerclient.openstack.common.apiclient import exceptions +from ceilometerclient import exc def _check_ceilometer_api(): @@ -36,12 +36,13 @@ def _check_ceilometer_api(): def meters_list(): try: return client.meters.list() - except exceptions.Gone as ex: - msg = json.loads(ex.response.content) - utils.warning(re.sub(r'\s\s*', ' ', msg['error_message'])) + except exc.HTTPNotFound as ex: + utils.warning('Did not find Ceilometer API running ' + 'on given endpoint') except Exception as ex: utils.critical(str(ex)) + elapsed, meters = utils.timeit(meters_list) if not meters: utils.critical("Unable to contact Ceilometer API.") diff --git a/monitoring-for-openstack/oschecks/utils.py b/monitoring-for-openstack/oschecks/utils.py index d43340e..24719aa 100644 --- a/monitoring-for-openstack/oschecks/utils.py +++ b/monitoring-for-openstack/oschecks/utils.py @@ -181,11 +181,6 @@ class Ceilometer(object): from ceilometerclient import shell self.ceilometer = shell.CeilometerShell() self.base_argv = copy.deepcopy(sys.argv[1:]) - # NOTE(gordc): workaround for bug1434264 - if not hasattr(self.ceilometer, 'auth_plugin'): - from ceilometerclient import client - if hasattr(client, 'AuthPlugin'): - self.ceilometer.auth_plugin = client.AuthPlugin() self.ceilometer.parser = self.ceilometer.get_base_parser() self.add_argument = self.ceilometer.parser.add_argument