From 7840ad1cf3c79a6eac4d13b6daae89449138defb Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Thu, 23 Feb 2017 16:07:50 +0100 Subject: [PATCH] Disable check metrics to avoid redundant metrics Change-Id: I70ce02e6f6ad90b81aa758e4ddad2eb17f989b67 --- .../modules/lma_collector/files/collectd/hypervisor_stats.py | 3 ++- .../modules/lma_collector/files/collectd/openstack_cinder.py | 2 +- .../lma_collector/files/collectd/openstack_cinder_services.py | 3 ++- .../modules/lma_collector/files/collectd/openstack_glance.py | 2 +- .../modules/lma_collector/files/collectd/openstack_keystone.py | 3 ++- .../modules/lma_collector/files/collectd/openstack_neutron.py | 2 +- .../lma_collector/files/collectd/openstack_neutron_agents.py | 3 ++- .../modules/lma_collector/files/collectd/openstack_nova.py | 3 ++- .../lma_collector/files/collectd/openstack_nova_services.py | 3 ++- 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/hypervisor_stats.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/hypervisor_stats.py index 9b61e3ceb..3e8b8fa81 100644 --- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/hypervisor_stats.py +++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/hypervisor_stats.py @@ -138,7 +138,8 @@ class HypervisorStatsPlugin(openstack.CollectdPlugin): 'values': v, } -plugin = HypervisorStatsPlugin(collectd, PLUGIN_NAME) +plugin = HypervisorStatsPlugin(collectd, PLUGIN_NAME, + disable_check_metric=True) def config_callback(conf): diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py index 880e08218..38ebab4bd 100644 --- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py +++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py @@ -88,7 +88,7 @@ class CinderStatsPlugin(openstack.CollectdPlugin): } -plugin = CinderStatsPlugin(collectd, PLUGIN_NAME) +plugin = CinderStatsPlugin(collectd, PLUGIN_NAME, disable_check_metric=True) def config_callback(conf): diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder_services.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder_services.py index df08f28e4..56d5ad7b7 100644 --- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder_services.py +++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder_services.py @@ -74,7 +74,8 @@ class CinderServiceStatsPlugin(openstack.CollectdPlugin): } -plugin = CinderServiceStatsPlugin(collectd, PLUGIN_NAME) +plugin = CinderServiceStatsPlugin(collectd, PLUGIN_NAME, + disable_check_metric=True) def config_callback(conf): diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_glance.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_glance.py index f2e45abd7..4886967dc 100644 --- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_glance.py +++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_glance.py @@ -83,7 +83,7 @@ class GlanceStatsPlugin(openstack.CollectdPlugin): 'meta': {'visibility': visibility, 'status': status}, } -plugin = GlanceStatsPlugin(collectd, PLUGIN_NAME) +plugin = GlanceStatsPlugin(collectd, PLUGIN_NAME, disable_check_metric=True) def config_callback(conf): diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_keystone.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_keystone.py index e631baf01..cbd4e4d8e 100644 --- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_keystone.py +++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_keystone.py @@ -80,7 +80,8 @@ class KeystoneStatsPlugin(openstack.CollectdPlugin): 'values': len(roles), } -plugin = KeystoneStatsPlugin(collectd, PLUGIN_NAME) +plugin = KeystoneStatsPlugin(collectd, PLUGIN_NAME, + disable_check_metric=True) def config_callback(conf): 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 69d7f9e0b..a9ccff02f 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 @@ -110,7 +110,7 @@ class NeutronStatsPlugin(openstack.CollectdPlugin): yield {'type_instance': 'floatingips', 'values': len(routers)} -plugin = NeutronStatsPlugin(collectd, PLUGIN_NAME) +plugin = NeutronStatsPlugin(collectd, PLUGIN_NAME, disable_check_metric=True) def config_callback(conf): diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron_agents.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron_agents.py index 611605514..3ae5ed750 100644 --- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron_agents.py +++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron_agents.py @@ -77,7 +77,8 @@ class NeutronAgentStatsPlugin(openstack.CollectdPlugin): } -plugin = NeutronAgentStatsPlugin(collectd, PLUGIN_NAME) +plugin = NeutronAgentStatsPlugin(collectd, PLUGIN_NAME, + disable_check_metric=True) def config_callback(conf): diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova.py index 8cdd57d08..4f8f1a811 100644 --- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova.py +++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova.py @@ -51,7 +51,8 @@ class NovaInstanceStatsPlugin(openstack.CollectdPlugin): } -plugin = NovaInstanceStatsPlugin(collectd, PLUGIN_NAME) +plugin = NovaInstanceStatsPlugin(collectd, PLUGIN_NAME, + disable_check_metric=True) def config_callback(conf): diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova_services.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova_services.py index 774c28cc6..c9f84eb58 100644 --- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova_services.py +++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova_services.py @@ -79,7 +79,8 @@ class NovaServiceStatsPlugin(openstack.CollectdPlugin): } -plugin = NovaServiceStatsPlugin(collectd, PLUGIN_NAME) +plugin = NovaServiceStatsPlugin(collectd, PLUGIN_NAME, + disable_check_metric=True) def config_callback(conf):