summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-24 14:32:38 +0000
committerGerrit Code Review <review@openstack.org>2017-02-24 14:32:38 +0000
commit5f4cab904785e3e1b078bd90f4e9c0d29473da85 (patch)
tree3f471816ed43d80dbed45bcc9a30040c4d81724b
parentf984c73aacfd83cd7a296b3c89ad55d65592d9f5 (diff)
parent7840ad1cf3c79a6eac4d13b6daae89449138defb (diff)
Merge "Disable check metrics to avoid redundant metrics"
-rw-r--r--deployment_scripts/puppet/modules/lma_collector/files/collectd/hypervisor_stats.py3
-rw-r--r--deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py2
-rw-r--r--deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder_services.py3
-rw-r--r--deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_glance.py2
-rw-r--r--deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_keystone.py3
-rw-r--r--deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron.py2
-rw-r--r--deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron_agents.py3
-rw-r--r--deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova.py3
-rw-r--r--deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova_services.py3
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 9b61e3c..3e8b8fa 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):
138 'values': v, 138 'values': v,
139 } 139 }
140 140
141plugin = HypervisorStatsPlugin(collectd, PLUGIN_NAME) 141plugin = HypervisorStatsPlugin(collectd, PLUGIN_NAME,
142 disable_check_metric=True)
142 143
143 144
144def config_callback(conf): 145def 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 880e082..38ebab4 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):
88 } 88 }
89 89
90 90
91plugin = CinderStatsPlugin(collectd, PLUGIN_NAME) 91plugin = CinderStatsPlugin(collectd, PLUGIN_NAME, disable_check_metric=True)
92 92
93 93
94def config_callback(conf): 94def 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 df08f28..56d5ad7 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):
74 } 74 }
75 75
76 76
77plugin = CinderServiceStatsPlugin(collectd, PLUGIN_NAME) 77plugin = CinderServiceStatsPlugin(collectd, PLUGIN_NAME,
78 disable_check_metric=True)
78 79
79 80
80def config_callback(conf): 81def 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 f2e45ab..4886967 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):
83 'meta': {'visibility': visibility, 'status': status}, 83 'meta': {'visibility': visibility, 'status': status},
84 } 84 }
85 85
86plugin = GlanceStatsPlugin(collectd, PLUGIN_NAME) 86plugin = GlanceStatsPlugin(collectd, PLUGIN_NAME, disable_check_metric=True)
87 87
88 88
89def config_callback(conf): 89def 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 e631baf..cbd4e4d 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):
80 'values': len(roles), 80 'values': len(roles),
81 } 81 }
82 82
83plugin = KeystoneStatsPlugin(collectd, PLUGIN_NAME) 83plugin = KeystoneStatsPlugin(collectd, PLUGIN_NAME,
84 disable_check_metric=True)
84 85
85 86
86def config_callback(conf): 87def 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 69d7f9e..a9ccff0 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):
110 yield {'type_instance': 'floatingips', 'values': len(routers)} 110 yield {'type_instance': 'floatingips', 'values': len(routers)}
111 111
112 112
113plugin = NeutronStatsPlugin(collectd, PLUGIN_NAME) 113plugin = NeutronStatsPlugin(collectd, PLUGIN_NAME, disable_check_metric=True)
114 114
115 115
116def config_callback(conf): 116def 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 6116055..3ae5ed7 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):
77 } 77 }
78 78
79 79
80plugin = NeutronAgentStatsPlugin(collectd, PLUGIN_NAME) 80plugin = NeutronAgentStatsPlugin(collectd, PLUGIN_NAME,
81 disable_check_metric=True)
81 82
82 83
83def config_callback(conf): 84def 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 48bbf0a..084e7b1 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
@@ -64,7 +64,8 @@ class NovaInstanceStatsPlugin(openstack.CollectdPlugin):
64 } 64 }
65 65
66 66
67plugin = NovaInstanceStatsPlugin(collectd, PLUGIN_NAME) 67plugin = NovaInstanceStatsPlugin(collectd, PLUGIN_NAME,
68 disable_check_metric=True)
68 69
69 70
70def config_callback(conf): 71def 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 774c28c..c9f84eb 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):
79 } 79 }
80 80
81 81
82plugin = NovaServiceStatsPlugin(collectd, PLUGIN_NAME) 82plugin = NovaServiceStatsPlugin(collectd, PLUGIN_NAME,
83 disable_check_metric=True)
83 84
84 85
85def config_callback(conf): 86def config_callback(conf):