
There were two places that had all of the logic for constructing a metering message and sending it to the appropriate exchanges. This changeset combines those into one function and invokes the function from the old locations. Update tox.ini to work around an issue with providing access to the global site-packages (https://bitbucket.org/hpk42/tox/issue/32). Change-Id: If2b01edbc0c372907a04baf69f1137575b6921bd
82 lines
2.8 KiB
Python
82 lines
2.8 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 eNovance <licensing@enovance.com>
|
|
#
|
|
# Author: Julien Danjou <julien@danjou.info>
|
|
#
|
|
# 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.
|
|
|
|
from nova import context
|
|
from nova import flags
|
|
from nova import manager
|
|
from nova.rpc import dispatcher as rpc_dispatcher
|
|
|
|
from ceilometer import cfg
|
|
from ceilometer import log
|
|
from ceilometer import publish
|
|
from ceilometer import rpc
|
|
from ceilometer.collector import dispatcher
|
|
|
|
# FIXME(dhellmann): There must be another way to do this.
|
|
# Import rabbit_notifier to register notification_topics flag
|
|
import nova.notifier.rabbit_notifier
|
|
|
|
FLAGS = flags.FLAGS
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
COMPUTE_COLLECTOR_NAMESPACE = 'ceilometer.collector.compute'
|
|
|
|
|
|
class CollectorManager(manager.Manager):
|
|
|
|
def init_host(self):
|
|
self.connection = rpc.Connection(flags.FLAGS)
|
|
|
|
self.compute_handler = dispatcher.NotificationDispatcher(
|
|
COMPUTE_COLLECTOR_NAMESPACE,
|
|
self._publish_counter,
|
|
)
|
|
# FIXME(dhellmann): Should be using create_worker(), except
|
|
# that notification messages do not conform to the RPC
|
|
# invocation protocol (they do not include a "method"
|
|
# parameter).
|
|
self.connection.declare_topic_consumer(
|
|
topic='%s.info' % flags.FLAGS.notification_topics[0],
|
|
callback=self.compute_handler.notify)
|
|
|
|
# Set ourselves up as a separate worker for the metering data,
|
|
# since the default for manager is to use create_consumer().
|
|
self.connection.create_worker(
|
|
cfg.CONF.metering_topic,
|
|
rpc_dispatcher.RpcDispatcher([self]),
|
|
'ceilometer.collector.' + cfg.CONF.metering_topic,
|
|
)
|
|
|
|
self.connection.consume_in_thread()
|
|
|
|
def _publish_counter(self, counter):
|
|
"""Create a metering message for the counter and publish it."""
|
|
ctxt = context.get_admin_context()
|
|
publish.publish_counter(ctxt, counter)
|
|
|
|
def record_metering_data(self, context, data):
|
|
"""This method is triggered when metering data is
|
|
cast from an agent.
|
|
"""
|
|
#LOG.info('metering data: %r', data)
|
|
LOG.info('metering data %s for %s: %s',
|
|
data['event_type'],
|
|
data['resource_id'],
|
|
data['counter_volume'])
|