x
/
fuel-plugin-lma-collector
Code Issues Proposed changes

Factorize collectd Python plugins 

The mechanism of dependant resources and notification is needed for other plugins.

Change-Id: I24dd00583326689294dee4e4d1076c05f3c1e022
This commit is contained in:
Swann Croiset 2016-02-11 14:50:58 +01:00
parent 3f727dfe1b
commit dda7560d78
17 changed files with 93 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
deployment_scripts/puppet/modules/lma_collector/files/collectd/base.py
View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from functools import wraps
import json
import signal
import subprocess
@ -20,28 +21,53 @@ import sys
import time
import traceback
import collectd
INTERVAL = 10
# A decorator that will call the decorated function only when the plugin has
# detected that it is currently active.
def read_callback_wrapper(f):
@wraps(f)
def wrapper(self, *args, **kwargs):
if self.do_collect_data:
f(self, *args, **kwargs)
return wrapper
class Base(object):
"""Base class for writing Python plugins."""
FAIL = 0
OK = 1
UNKNOWN = 2
MAX_IDENTIFIER_LENGTH = 63
def __init__(self, *args, **kwargs):
def __init__(self, collectd):
self.debug = False
self.timeout = 5
self.max_retries = 3
self.logger = collectd
self.collectd = collectd
self.plugin = None
self.plugin_instance = ''
# attributes controlling whether the plugin is in collect mode or not
self.depends_on_resource = None
self.do_collect_data = True
def config_callback(self, conf):
for node in conf.children:
if node.key == "Debug":
if node.values[0] in ['True', 'true']:
self.debug = True
if node.key == "Timeout":
elif node.key == "Timeout":
self.timeout = int(node.values[0])
elif node.key == 'MaxRetries':
self.max_retries = int(node.values[0])
elif node.key == 'DependsOnResource':
self.depends_on_resource = node.values[0]
def read_callback(self):
try:
@ -60,6 +86,7 @@ class Base(object):
- 'values', a scalar number or a list of numbers if the type
defines several datasources.
- 'type_instance' (optional)
- 'plugin_instance' (optional)
- 'type' (optional, default='gauge')
For example:
@ -82,7 +109,7 @@ class Base(object):
(self.plugin, type_instance[:24], len(type_instance),
self.MAX_IDENTIFIER_LENGTH))
v = collectd.Values(
v = self.collectd.Values(
plugin=self.plugin,
type=metric.get('type', 'gauge'),
plugin_instance=self.plugin_instance,
@ -174,6 +201,31 @@ class Base(object):
if sys.version_info[0] == 2 and sys.version_info[1] <= 6:
signal.signal(signal.SIGCHLD, signal.SIG_DFL)
def notification_callback(self, notification):
if not self.depends_on_resource:
return
try:
data = json.loads(notification.message)
except ValueError:
return
if 'value' not in data:
self.logger.warning(
"%s: missing 'value' in notification" %
self.__class__.__name__)
elif 'resource' not in data:
self.logger.warning(
"%s: missing 'resource' in notification" %
self.__class__.__name__)
elif data['resource'] == self.depends_on_resource:
do_collect_data = data['value'] > 0
if self.do_collect_data != do_collect_data:
# log only the transitions
self.logger.notice("%s: do_collect_data=%s" %
(self.__class__.__name__, do_collect_data))
self.do_collect_data = do_collect_data
class CephBase(Base):

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/ceph_osd_perf.py
View File

@ -80,7 +80,7 @@ class CephOSDPerfPlugin(base.CephBase):
'values': self.convert_to_collectd_value(stats[k])
}
plugin = CephOSDPerfPlugin()
plugin = CephOSDPerfPlugin(collectd)
def init_callback():

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/ceph_osd_stats.py
View File

@ -47,7 +47,7 @@ class CephOSDStatsPlugin(base.CephBase):
osd['fs_perf_stat']['commit_latency_ms']],
}
plugin = CephOSDStatsPlugin()
plugin = CephOSDStatsPlugin(collectd)
def init_callback():

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/ceph_pg_mon_status.py
View File

@ -78,7 +78,7 @@ class CephMonPlugin(base.CephBase):
'values': state['count']
}
plugin = CephMonPlugin()
plugin = CephMonPlugin(collectd)
def init_callback():

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/ceph_pool_osd.py
View File

@ -116,7 +116,7 @@ class CephPoolPlugin(base.CephBase):
'values': [_up, _down, _in, _out]
}
plugin = CephPoolPlugin()
plugin = CephPoolPlugin(collectd)
def init_callback():

8
deployment_scripts/puppet/modules/lma_collector/files/collectd/check_openstack_api.py
View File

@ -15,6 +15,8 @@
#
# Collectd plugin for checking the status of OpenStack API services
import collectd
import base
import openstack
from urlparse import urlparse
@ -26,10 +28,6 @@ INTERVAL = openstack.INTERVAL
class APICheckPlugin(openstack.CollectdPlugin):
"""Class to check the status of OpenStack API services."""
FAIL = 0
OK = 1
UNKNOWN = 2
# TODO(all): sahara, murano
CHECK_MAP = {
'keystone': {
@ -94,7 +92,7 @@ class APICheckPlugin(openstack.CollectdPlugin):
'region': service['region']
}
@openstack.read_callback_wrapper
@base.read_callback_wrapper
def read_callback(self):
for item in self.check_api():
if item['status'] == self.UNKNOWN:

3
deployment_scripts/puppet/modules/lma_collector/files/collectd/elasticsearch_cluster.py
View File

@ -37,7 +37,6 @@ class ElasticsearchClusterHealthPlugin(base.Base):
self.plugin = NAME
self.address = '127.0.0.1'
self.port = 9200
self.max_retries = 3
self.session = requests.Session()
self.url = None
self.session.mount(
@ -86,7 +85,7 @@ class ElasticsearchClusterHealthPlugin(base.Base):
'values': data[metric]
}
plugin = ElasticsearchClusterHealthPlugin()
plugin = ElasticsearchClusterHealthPlugin(collectd)
def init_callback():

4
deployment_scripts/puppet/modules/lma_collector/files/collectd/hypervisor_stats.py
View File

@ -15,6 +15,8 @@
#
# Collectd plugin for getting hypervisor statistics from Nova
import collectd
import base
import openstack
PLUGIN_NAME = 'hypervisor_stats'
@ -55,7 +57,7 @@ class HypervisorStatsPlugin(openstack.CollectdPlugin):
v.host = host
v.dispatch()
@openstack.read_callback_wrapper
@base.read_callback_wrapper
def read_callback(self):
r = self.get('nova', 'os-hypervisors/detail')
if not r:

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/influxdb.py
View File

@ -128,7 +128,7 @@ class InfluxDBClusterPlugin(base.Base):
}
plugin = InfluxDBClusterPlugin()
plugin = InfluxDBClusterPlugin(collectd)
def init_callback():

60
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack.py
View File

@ -12,13 +12,15 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import base
import datetime
import dateutil.parser
import dateutil.tz
from functools import wraps
import requests
import simplejson as json
# By default, query OpenStack API endpoints every 50 seconds. We choose a value
# less than the default group by interval (which is 60 seconds) to avoid gaps
# in the Grafana graphs.
@ -145,28 +147,12 @@ class OSClient(object):
return r
# A decorator that will call the decorated function only when the plugin has
# detected that it is currently active.
def read_callback_wrapper(f):
@wraps(f)
def wrapper(self, *args, **kwargs):
if self.do_collect_data:
f(self, *args, **kwargs)
class CollectdPlugin(base.Base):
return wrapper
class CollectdPlugin(object):
def __init__(self, logger):
def __init__(self, *args, **kwargs):
super(CollectdPlugin, self).__init__(*args, **kwargs)
self.os_client = None
self.logger = logger
self.timeout = 5
self.max_retries = 3
self.extra_config = {}
# attributes controlling whether the plugin is in collect mode or not
self.do_collect_data = True
self.depends_on_resource = None
def _build_url(self, service, resource):
s = (self.get_service(service) or {})
@ -209,12 +195,9 @@ class CollectdPlugin(object):
if x['name'] == service_name), None)
def config_callback(self, config):
super(CollectdPlugin, self).config_callback(config)
for node in config.children:
if node.key == 'Timeout':
self.timeout = int(node.values[0])
elif node.key == 'MaxRetries':
self.max_retries = int(node.values[0])
elif node.key == 'Username':
if node.key == 'Username':
username = node.values[0]
elif node.key == 'Password':
password = node.values[0]
@ -222,37 +205,10 @@ class CollectdPlugin(object):
tenant_name = node.values[0]
elif node.key == 'KeystoneUrl':
keystone_url = node.values[0]
elif node.key == 'DependsOnResource':
self.depends_on_resource = node.values[0]
self.os_client = OSClient(username, password, tenant_name,
keystone_url, self.timeout, self.logger,
self.max_retries)
def notification_callback(self, notification):
if not self.depends_on_resource:
return
try:
data = json.loads(notification.message)
except ValueError:
return
if 'value' not in data:
self.logger.warning(
"%s: missing 'value' in notification" %
self.__class__.__name__)
elif 'resource' not in data:
self.logger.warning(
"%s: missing 'resource' in notification" %
self.__class__.__name__)
elif data['resource'] == self.depends_on_resource:
do_collect_data = data['value'] > 0
if self.do_collect_data != do_collect_data:
# log only the transitions
self.logger.notice("%s: do_collect_data=%s" %
(self.__class__.__name__, do_collect_data))
self.do_collect_data = do_collect_data
def read_callback(self):
""" Read metrics and dispatch values

7
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_cinder.py
View File

@ -15,6 +15,8 @@
#
# Collectd plugin for getting statistics from Cinder
import collectd
import base
import openstack
PLUGIN_NAME = 'cinder'
@ -28,10 +30,7 @@ class CinderStatsPlugin(openstack.CollectdPlugin):
total size of volumes usable and in error state
"""
def config_callback(self, config):
super(CinderStatsPlugin, self).config_callback(config)
@openstack.read_callback_wrapper
@base.read_callback_wrapper
def read_callback(self):
volumes_details = self.get_objects_details('cinder', 'volumes')

7
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_glance.py
View File

@ -15,6 +15,8 @@
#
# Collectd plugin for getting resource statistics from Glance
import collectd
import base
import openstack
PLUGIN_NAME = 'glance'
@ -28,10 +30,7 @@ class GlanceStatsPlugin(openstack.CollectdPlugin):
total size of images usable and in error state
"""
def config_callback(self, config):
super(GlanceStatsPlugin, self).config_callback(config)
@openstack.read_callback_wrapper
@base.read_callback_wrapper
def read_callback(self):
def is_snap(d):

7
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_keystone.py
View File

@ -15,6 +15,8 @@
#
# Collectd plugin for getting statistics from Keystone
import collectd
import base
import openstack
PLUGIN_NAME = 'keystone'
@ -28,10 +30,7 @@ class KeystoneStatsPlugin(openstack.CollectdPlugin):
number of roles
"""
def config_callback(self, config):
super(KeystoneStatsPlugin, self).config_callback(config)
@openstack.read_callback_wrapper
@base.read_callback_wrapper
def read_callback(self):
def groupby(d):

7
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_neutron.py
View File

@ -15,6 +15,8 @@
#
# Collectd plugin for getting resource statistics from Neutron
import collectd
import base
import openstack
PLUGIN_NAME = 'neutron'
@ -31,10 +33,7 @@ class NeutronStatsPlugin(openstack.CollectdPlugin):
number of floating IP addresses broken down by free/associated
"""
def config_callback(self, config):
super(NeutronStatsPlugin, self).config_callback(config)
@openstack.read_callback_wrapper
@base.read_callback_wrapper
def read_callback(self):
def groupby_network(x):
return "networks.%s" % x.get('status', 'unknown').lower()

7
deployment_scripts/puppet/modules/lma_collector/files/collectd/openstack_nova.py
View File

@ -15,6 +15,8 @@
#
# Collectd plugin for getting statistics from Nova
import collectd
import base
import openstack
PLUGIN_NAME = 'nova'
@ -27,10 +29,7 @@ class NovaStatsPlugin(openstack.CollectdPlugin):
number of instances broken down by state
"""
def config_callback(self, config):
super(NovaStatsPlugin, self).config_callback(config)
@openstack.read_callback_wrapper
@base.read_callback_wrapper
def read_callback(self):
servers_details = self.get_objects_details('nova', 'servers')

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/pacemaker_resource.py
View File

@ -60,7 +60,7 @@ class PacemakerResourcePlugin(base.Base):
'values': value
}
plugin = PacemakerResourcePlugin()
plugin = PacemakerResourcePlugin(collectd)
def init_callback():

2
deployment_scripts/puppet/modules/lma_collector/files/collectd/rabbitmq_info.py
View File

@ -212,7 +212,7 @@ class RabbitMqPlugin(base.Base):
yield {'type_instance': k, 'values': v}
plugin = RabbitMqPlugin()
plugin = RabbitMqPlugin(collectd)
def init_callback():