
Precursor-to: BP decoupled-source-sink-discoverable-resources Add the concept of per-AgentManager resource discovery extensions loaded via stevedore entry points. The extensions are loaded from a single namespace: ceilometer.discover shared by all agents. An agent may have a list of per-agent default discovery extensions associated with it on creation. This is used by the compute agent, which currently uses a single discovery extension for all matching pipelines. The per-pipeline statically configured resources remain in place to potentially override the per-agent discovered resources - these will be augmented by per-pipeline discovery in a subsequent patch. Recast the compute agent's interrogation of the nova servers API in the form of a discovery extension. Unify the pollster abstraction used by the central and compute agents (which had previously diverged along with the introduction of per-pipeline resources). Unify the polling task logic used by the central and compute agents (so that the compute agent now iterates over each pollster for all local instances, as opposed to interating over all pollsters for each local instance). Change-Id: I625df47231a1dbf7ef721c297701799b224ce67e
157 lines
5.6 KiB
Python
157 lines
5.6 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2013 Julien Danjou
|
|
# Copyright © 2014 Red Hat, Inc
|
|
#
|
|
# Authors: Julien Danjou <julien@danjou.info>
|
|
# Eoghan Glynn <eglynn@redhat.com>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, 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 collections
|
|
import itertools
|
|
import urlparse
|
|
|
|
from stevedore import extension
|
|
|
|
from ceilometer.openstack.common import context
|
|
from ceilometer.openstack.common.gettextutils import _ # noqa
|
|
from ceilometer.openstack.common import log
|
|
from ceilometer.openstack.common import service as os_service
|
|
from ceilometer import pipeline
|
|
from ceilometer import transformer
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
class PollingTask(object):
|
|
"""Polling task for polling samples and inject into pipeline.
|
|
A polling task can be invoked periodically or only once.
|
|
"""
|
|
|
|
def __init__(self, agent_manager):
|
|
self.manager = agent_manager
|
|
self.pollsters = set()
|
|
# Resource definitions are indexed by the pollster
|
|
# Use dict of set here to remove the duplicated resource definitions
|
|
# for each pollster.
|
|
self.resources = collections.defaultdict(set)
|
|
self.publish_context = pipeline.PublishContext(
|
|
agent_manager.context)
|
|
|
|
def add(self, pollster, pipelines):
|
|
self.publish_context.add_pipelines(pipelines)
|
|
for pipeline in pipelines:
|
|
self.resources[pollster.name].update(pipeline.resources)
|
|
self.pollsters.update([pollster])
|
|
|
|
def poll_and_publish(self):
|
|
"""Polling sample and publish into pipeline."""
|
|
agent_resources = self.manager.discover()
|
|
with self.publish_context as publisher:
|
|
cache = {}
|
|
for pollster in self.pollsters:
|
|
LOG.info(_("Polling pollster %s"), pollster.name)
|
|
source_resources = list(self.resources[pollster.name])
|
|
try:
|
|
samples = list(pollster.obj.get_samples(
|
|
self.manager,
|
|
cache,
|
|
resources=source_resources or agent_resources,
|
|
))
|
|
publisher(samples)
|
|
except Exception as err:
|
|
LOG.warning(_(
|
|
'Continue after error from %(name)s: %(error)s')
|
|
% ({'name': pollster.name, 'error': err}),
|
|
exc_info=True)
|
|
|
|
|
|
class AgentManager(os_service.Service):
|
|
|
|
def __init__(self, namespace, default_discovery=[]):
|
|
super(AgentManager, self).__init__()
|
|
self.default_discovery = default_discovery
|
|
self.pollster_manager = self._extensions('poll', namespace)
|
|
self.discovery_manager = self._extensions('discover')
|
|
self.context = context.RequestContext('admin', 'admin', is_admin=True)
|
|
|
|
@staticmethod
|
|
def _extensions(category, agent_ns=None):
|
|
namespace = ('ceilometer.%s.%s' % (category, agent_ns) if agent_ns
|
|
else 'ceilometer.%s' % category)
|
|
return extension.ExtensionManager(
|
|
namespace=namespace,
|
|
invoke_on_load=True,
|
|
)
|
|
|
|
def create_polling_task(self):
|
|
"""Create an initially empty polling task."""
|
|
return PollingTask(self)
|
|
|
|
def setup_polling_tasks(self):
|
|
polling_tasks = {}
|
|
for pipeline, pollster in itertools.product(
|
|
self.pipeline_manager.pipelines,
|
|
self.pollster_manager.extensions):
|
|
if pipeline.support_meter(pollster.name):
|
|
polling_task = polling_tasks.get(pipeline.interval)
|
|
if not polling_task:
|
|
polling_task = self.create_polling_task()
|
|
polling_tasks[pipeline.interval] = polling_task
|
|
polling_task.add(pollster, [pipeline])
|
|
|
|
return polling_tasks
|
|
|
|
def start(self):
|
|
self.pipeline_manager = pipeline.setup_pipeline(
|
|
transformer.TransformerExtensionManager(
|
|
'ceilometer.transformer',
|
|
),
|
|
)
|
|
|
|
for interval, task in self.setup_polling_tasks().iteritems():
|
|
self.tg.add_timer(interval,
|
|
self.interval_task,
|
|
task=task)
|
|
|
|
@staticmethod
|
|
def interval_task(task):
|
|
task.poll_and_publish()
|
|
|
|
@staticmethod
|
|
def _parse_discoverer(url):
|
|
s = urlparse.urlparse(url)
|
|
return (s.scheme or s.path), (s.netloc + s.path if s.scheme else None)
|
|
|
|
def _discoverer(self, name):
|
|
for d in self.discovery_manager:
|
|
if d.name == name:
|
|
return d.obj
|
|
return None
|
|
|
|
def discover(self, discovery=[]):
|
|
resources = []
|
|
for url in (discovery or self.default_discovery):
|
|
name, param = self._parse_discoverer(url)
|
|
discoverer = self._discoverer(name)
|
|
if discoverer:
|
|
try:
|
|
discovered = discoverer.discover(param)
|
|
resources.extend(discovered)
|
|
except Exception as err:
|
|
LOG.exception(_('Unable to discover resources: %s') % err)
|
|
else:
|
|
LOG.warning(_('Unknown discovery extension: %s') % name)
|
|
return resources
|