Browse Source

Merge "Disable check metrics to avoid redundant metrics"

changes/36/442036/1
Jenkins 2 years ago
parent
commit
5f4cab9047
9 changed files with 15 additions and 9 deletions
  1. +2
    -1
      deployment_scripts/puppet/modules/lma_collector/files/collectd/hypervisor_stats.py
  2. +1
    -1
      deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py
  3. +2
    -1
      deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder_services.py
  4. +1
    -1
      deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_glance.py
  5. +2
    -1
      deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_keystone.py
  6. +1
    -1
      deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron.py
  7. +2
    -1
      deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron_agents.py
  8. +2
    -1
      deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova.py
  9. +2
    -1
      deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova_services.py

+ 2
- 1
deployment_scripts/puppet/modules/lma_collector/files/collectd/hypervisor_stats.py View File

@@ -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):

+ 1
- 1
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py View File

@@ -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):

+ 2
- 1
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder_services.py View File

@@ -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):

+ 1
- 1
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_glance.py View File

@@ -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):

+ 2
- 1
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_keystone.py View File

@@ -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):

+ 1
- 1
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron.py View File

@@ -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):

+ 2
- 1
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron_agents.py View File

@@ -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):

+ 2
- 1
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova.py View File

@@ -64,7 +64,8 @@ class NovaInstanceStatsPlugin(openstack.CollectdPlugin):
}


plugin = NovaInstanceStatsPlugin(collectd, PLUGIN_NAME)
plugin = NovaInstanceStatsPlugin(collectd, PLUGIN_NAME,
disable_check_metric=True)


def config_callback(conf):

+ 2
- 1
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova_services.py View File

@@ -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):

Loading…
Cancel
Save