openstack
/
congress
Code Issues Proposed changes

Merge "Supress ceilometer event list error"

This commit is contained in:
Jenkins 2017-02-02 23:18:02 +00:00 committed by Gerrit Code Review
parent fb9ccf8249 f7c240e869
commit 54926c4411
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
congress/datasources/ceilometer_driver.py
View File

@ -199,14 +199,22 @@ class CeilometerDriver(datasource_driver.PollingDataSourceDriver,
alarms_list_suppress_no_aodh_error(self.ceilometer_client))
self.add_update_method(alarms_method, self.alarms_translator)
events_method = lambda: self._translate_events(
self.ceilometer_client.events.list())
events_method = lambda: self._translate_events(self._events_list())
self.add_update_method(events_method, self.events_translator)
statistics_method = lambda: self._translate_statistics(
self._get_statistics(self.ceilometer_client.meters.list()))
self.add_update_method(statistics_method, self.statistics_translator)
def _events_list(self):
try:
return self.ceilometer_client.events.list()
except (ceilometerclient.exc.HTTPException,
exceptions.ConnectFailure):
LOG.info('events list not available because Panko is disabled or '
'unavailable. Empty list reported instead')
return []
def _get_statistics(self, meters):
statistics = []
names = set()