openstack
/
monasca-agent
Code Issues Proposed changes

Merge "Change dimension 'service' to 'component' on HAProxy plugin"

This commit is contained in:
Jenkins 2017-07-26 02:37:27 +00:00 committed by Gerrit Code Review
parent 3c3138c6f4 f71394423f
commit 7cf40912df
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monasca_agent/collector/checks_d/haproxy.py
View File

@ -50,7 +50,7 @@ class HAProxy(AgentCheck):
} }
def check(self, instance): def check(self, instance):
self.dimensions = self._set_dimensions(None, instance) self.dimensions = self._set_dimensions({'service': 'haproxy'}, instance)
url = instance.get('url') url = instance.get('url')
username = instance.get('username') username = instance.get('username')
password = instance.get('password') password = instance.get('password')
@ -156,7 +156,7 @@ class HAProxy(AgentCheck):
for (service, status), count in hosts_statuses.items(): for (service, status), count in hosts_statuses.items():
status = status.lower() status = status.lower()
status_dimensions.update({'status': status, 'service': service}) status_dimensions.update({'status': status, 'component': service})
self.gauge("haproxy.count_per_status", count, dimensions=status_dimensions) self.gauge("haproxy.count_per_status", count, dimensions=status_dimensions)
if 'up' in status: if 'up' in status:
@ -166,7 +166,7 @@ class HAProxy(AgentCheck):
for service in agg_statuses: for service in agg_statuses:
for status, count in agg_statuses[service].items(): for status, count in agg_statuses[service].items():
status_dimensions.update({'status': status, 'service': service}) status_dimensions.update({'status': status, 'component': service})
self.gauge("haproxy.count_per_status", count, dimensions=status_dimensions) self.gauge("haproxy.count_per_status", count, dimensions=status_dimensions)
def _process_metrics(self, data_list, service, url): def _process_metrics(self, data_list, service, url):
@ -188,8 +188,7 @@ class HAProxy(AgentCheck):
metric_dimensions.update({'type': service, metric_dimensions.update({'type': service,
'instance_url': url, 'instance_url': url,
'service_name': service_name, 'component': service_name})
'service': 'haproxy'})
if service == Services.BACKEND: if service == Services.BACKEND:
metric_dimensions.update({'backend': hostname}) metric_dimensions.update({'backend': hostname})