7d8bd50d08
The move to oslo.config introduced a conflict in the nova notifier because both nova and ceilometer have copies of the openstack.common.rpc library and define an option for the AMQP exchange name for the project. This changeset decouples the notifier plugin in ceilometer from most of the ceilometer code, to remove that conflict. The nova notifier is rewritten to emit a new notification message with event type `compute.instance.delete.samples` instead of making the old RPC calls directly to the ceilometer collector, and a notification listener plugin is provided to convert those messages to sample data. The notifier implementations are split between the one that worked in folsom and the one that works in grizzly to maintain backwards compatibility. get_hypervisor_inspector() is moved to a location where it can be imported both by the compute agent manager and the notifier plugin. The definition of `disabled_compute_pollsters` option is also moved for the same reason. The tox configuration is changed to run the nova notifier tests separately from the other tests, since nose cannot import nova and ceilometer code in the same process. bug 1130952 Change-Id: I39ba4564c9c14f09dbdd768d7a83f6940e3942ad Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
176 lines
5.7 KiB
Python
176 lines
5.7 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# Author: Julien Danjou <julien@danjou.info>
|
|
# Doug Hellmann <doug.hellmann@dreamhost.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.
|
|
|
|
__all__ = [
|
|
'notify',
|
|
'DeletedInstanceStatsGatherer',
|
|
'initialize_gatherer',
|
|
'instance_info_source',
|
|
'_gatherer', # for tests to mock
|
|
]
|
|
|
|
import sys
|
|
|
|
from nova import notifications
|
|
from nova.openstack.common.notifier import api as notifier_api
|
|
from nova.openstack.common import log as logging
|
|
|
|
# HACK(dhellmann): Insert the nova version of openstack.common into
|
|
# sys.modules as though it was the copy from ceilometer, so that when
|
|
# we use modules from ceilometer below they do not re-define options.
|
|
import ceilometer # use the real ceilometer base package
|
|
for name in ['openstack', 'openstack.common', 'openstack.common.log']:
|
|
sys.modules['ceilometer.' + name] = sys.modules['nova.' + name]
|
|
|
|
from nova.conductor import api
|
|
|
|
from oslo.config import cfg
|
|
|
|
from ceilometer import extension_manager
|
|
from ceilometer.compute.virt import inspector
|
|
|
|
# This module runs inside the nova compute
|
|
# agent, which only configures the "nova" logger.
|
|
# We use a fake logger name in that namespace
|
|
# so that messages from this module appear
|
|
# in the log file.
|
|
LOG = logging.getLogger('nova.ceilometer.notifier')
|
|
|
|
_gatherer = None
|
|
instance_info_source = api.API()
|
|
|
|
|
|
class DeletedInstanceStatsGatherer(object):
|
|
|
|
def __init__(self, extensions):
|
|
self.mgr = extensions
|
|
self.inspector = inspector.get_hypervisor_inspector()
|
|
|
|
def _get_counters_from_plugin(self, ext, instance, *args, **kwds):
|
|
"""Used with the extenaion manager map() method."""
|
|
return ext.obj.get_counters(self, instance)
|
|
|
|
def __call__(self, instance):
|
|
counters = self.mgr.map(self._get_counters_from_plugin,
|
|
instance=instance,
|
|
)
|
|
# counters is a list of lists, so flatten it before returning
|
|
# the results
|
|
results = []
|
|
for clist in counters:
|
|
results.extend(clist)
|
|
return results
|
|
|
|
|
|
def initialize_gatherer(gatherer=None):
|
|
"""Set the callable used to gather stats for the instance.
|
|
|
|
gatherer should be a callable accepting one argument (the instance
|
|
ref), or None to have a default gatherer used
|
|
"""
|
|
global _gatherer
|
|
if gatherer is not None:
|
|
LOG.debug('using provided stats gatherer %r', gatherer)
|
|
_gatherer = gatherer
|
|
if _gatherer is None:
|
|
LOG.debug('making a new stats gatherer')
|
|
mgr = extension_manager.ActivatedExtensionManager(
|
|
namespace='ceilometer.poll.compute',
|
|
disabled_names=cfg.CONF.disabled_compute_pollsters,
|
|
)
|
|
_gatherer = DeletedInstanceStatsGatherer(mgr)
|
|
return _gatherer
|
|
|
|
|
|
class Instance(object):
|
|
"""Model class for instances
|
|
|
|
The pollsters all expect an instance that looks like what the
|
|
novaclient gives them, but the conductor API gives us a
|
|
dictionary. This class makes an object from the dictonary so we
|
|
can pass it to the pollsters.
|
|
"""
|
|
def __init__(self, info):
|
|
for k, v in info.iteritems():
|
|
setattr(self, k, v)
|
|
LOG.debug('INFO %r', info)
|
|
|
|
@property
|
|
def tenant_id(self):
|
|
return self.project_id
|
|
|
|
@property
|
|
def flavor(self):
|
|
return {
|
|
'id': self.instance_type_id,
|
|
'name': self.instance_type.get('name', 'UNKNOWN'),
|
|
}
|
|
|
|
@property
|
|
def hostId(self):
|
|
return self.host
|
|
|
|
@property
|
|
def image(self):
|
|
return {'id': self.image_ref}
|
|
|
|
|
|
def notify(context, message):
|
|
if message['event_type'] != 'compute.instance.delete.start':
|
|
LOG.debug('ignoring %s', message['event_type'])
|
|
return
|
|
LOG.info('processing %s', message['event_type'])
|
|
gatherer = initialize_gatherer()
|
|
|
|
instance_id = message['payload']['instance_id']
|
|
LOG.debug('polling final stats for %r', instance_id)
|
|
|
|
# Ask for the instance details
|
|
instance_ref = instance_info_source.instance_get_by_uuid(
|
|
context,
|
|
instance_id,
|
|
)
|
|
|
|
# Get the default notification payload
|
|
payload = notifications.info_from_instance(
|
|
context, instance_ref, None, None)
|
|
|
|
# Extend the payload with samples from our plugins. We only need
|
|
# to send some of the data from the counter objects, since a lot
|
|
# of the fields are the same.
|
|
instance = Instance(instance_ref)
|
|
counters = gatherer(instance)
|
|
payload['samples'] = [{'name': c.name,
|
|
'type': c.type,
|
|
'unit': c.unit,
|
|
'volume': c.volume}
|
|
for c in counters]
|
|
|
|
publisher_id = notifier_api.publisher_id('compute', None)
|
|
|
|
# We could simply modify the incoming message payload, but we
|
|
# can't be sure that this notifier will be called before the RPC
|
|
# notifier. Modifying the content may also break the message
|
|
# signature. So, we start a new message publishing. We will be
|
|
# called again recursively as a result, but we ignore the event we
|
|
# generate so it doesn't matter.
|
|
notifier_api.notify(context, publisher_id,
|
|
'compute.instance.delete.samples',
|
|
notifier_api.INFO, payload)
|