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

Merge "Emit the Nova workers metrics even if they never reported"

This commit is contained in:
Jenkins 2017-01-10 15:39:04 +00:00 committed by Gerrit Code Review
parent 3c15552c0a 067beab15c
commit d30c70e5df
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova.py
View File

@ -52,11 +52,16 @@ class NovaStatsPlugin(openstack.CollectdPlugin):
'service': service, 'service': service,
'state': state}) 'state': state})
for service in aggregated_workers: for service in set(aggregated_workers.keys()).union(
totalw = sum(aggregated_workers[service].values()) ('compute', 'scheduler', 'conductor', 'cert', 'consoleauth')):
total = sum(aggregated_workers[service].values())
for state in self.states: for state in self.states:
prct = (100.0 * aggregated_workers[service][state]) / totalw prct = 0
if total > 0:
prct = (100.0 * aggregated_workers[service][state]) / total
self.dispatch_value('nova_services_percent', '', self.dispatch_value('nova_services_percent', '',
prct, prct,
{'state': state, 'service': service}) {'state': state, 'service': service})
@ -64,7 +69,6 @@ class NovaStatsPlugin(openstack.CollectdPlugin):
self.dispatch_value('nova_services', '', self.dispatch_value('nova_services', '',
aggregated_workers[service][state], aggregated_workers[service][state],
{'state': state, 'service': service}) {'state': state, 'service': service})
servers_details = self.get_objects_details('nova', 'servers') servers_details = self.get_objects_details('nova', 'servers')
def groupby(d): def groupby(d):