From 275664c869e789560d3be9710ff2bd81db09c38c Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Thu, 2 Feb 2017 16:08:05 +0100 Subject: [PATCH] Retrieve only useful Neutron fields Change-Id: I5c2501b6d3af1a65c66237908221cb252f0ba32d --- .../files/collectd/openstack_neutron.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron.py index e677ec1f5..69d7f9e0b 100644 --- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron.py +++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron.py @@ -66,7 +66,8 @@ class NeutronStatsPlugin(openstack.CollectdPlugin): return "floatingips.%s" % status # Networks - networks = self.get_objects('neutron', 'networks', api_version='v2.0') + networks = self.get_objects('neutron', 'networks', api_version='v2.0', + params={'fields': ['id', 'status']}) status = self.count_objects_group_by(networks, group_by_func=groupby_network) for s, nb in status.iteritems(): @@ -74,11 +75,14 @@ class NeutronStatsPlugin(openstack.CollectdPlugin): yield {'type_instance': 'networks', 'values': len(networks)} # Subnets - subnets = self.get_objects('neutron', 'subnets', api_version='v2.0') + subnets = self.get_objects('neutron', 'subnets', api_version='v2.0', + params={'fields': ['id', 'status']}) yield {'type_instance': 'subnets', 'values': len(subnets)} # Ports - ports = self.get_objects('neutron', 'ports', api_version='v2.0') + ports = self.get_objects('neutron', 'ports', api_version='v2.0', + params={'fields': ['id', 'status', + 'device_owner']}) status = self.count_objects_group_by(ports, group_by_func=groupby_port) for s, nb in status.iteritems(): @@ -86,7 +90,8 @@ class NeutronStatsPlugin(openstack.CollectdPlugin): yield {'type_instance': 'ports', 'values': len(ports)} # Routers - routers = self.get_objects('neutron', 'routers', api_version='v2.0') + routers = self.get_objects('neutron', 'routers', api_version='v2.0', + params={'fields': ['id', 'status']}) status = self.count_objects_group_by(routers, group_by_func=groupby_router) for s, nb in status.iteritems(): @@ -95,7 +100,9 @@ class NeutronStatsPlugin(openstack.CollectdPlugin): # Floating IP addresses floatingips = self.get_objects('neutron', 'floatingips', - api_version='v2.0') + api_version='v2.0', + params={'fields': ['id', 'status', + 'port_id']}) status = self.count_objects_group_by(floatingips, group_by_func=groupby_floating) for s, nb in status.iteritems():