d9faf1c204
This patch includes several separate sets of changes which have been reviewed individually but must be submitted together to get past the newly updated version of pep8 and changes to the nova code base. 1. Replace our CONF object with the one from openstack.common.cfg. There's no need to use our own, especially since some option are already registered on it for us. Signed-off-by: Julien Danjou <julien.danjou@enovance.com> 2. Instead of importing the RPC code from nova, use the openstack.common.rpc package. This change copies that code in from openstack-common, changes the imports throughout ceilometer, and fixes the way the configuration settings are initialized. 3. Resolve PEP-8 issues introduced by an even more pedantic version of pep8 (1.3.1). Some of the changes are fixed, and some warnings/errors are suppressed. 4. Ignore import errors in impl_qpid because the qpid package is not installed on the stackforge test server. 5. Fix missing imports from gettextutils in openstack.common. Change-Id: I0ee7d4b3278d8ff1951ca27592e3be8a87fe4854
100 lines
3.6 KiB
Python
100 lines
3.6 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 ceilometer import log
|
|
from ceilometer import meter
|
|
from ceilometer import publish
|
|
from ceilometer import rpc
|
|
from ceilometer.collector import dispatcher
|
|
from ceilometer import storage
|
|
from ceilometer.openstack.common import cfg
|
|
from ceilometer.openstack.common.rpc import dispatcher as rpc_dispatcher
|
|
|
|
# FIXME(dhellmann): There must be another way to do this.
|
|
# Import rabbit_notifier to register notification_topics flag
|
|
import nova.notifier.rabbit_notifier
|
|
import nova.openstack.common.rpc as nova_rpc
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
COMPUTE_COLLECTOR_NAMESPACE = 'ceilometer.collector.compute'
|
|
|
|
|
|
class CollectorManager(manager.Manager):
|
|
|
|
def init_host(self):
|
|
# Use the nova configuration flags to get
|
|
# a connection to the RPC mechanism nova
|
|
# is using.
|
|
self.connection = nova_rpc.create_connection()
|
|
|
|
storage.register_opts(cfg.CONF)
|
|
self.storage_engine = storage.get_engine(cfg.CONF)
|
|
self.storage_conn = self.storage_engine.get_connection(cfg.CONF)
|
|
|
|
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['counter_name'],
|
|
data['resource_id'],
|
|
data['counter_volume'])
|
|
if not meter.verify_signature(data):
|
|
LOG.warning('message signature invalid, discarding message: %r',
|
|
data)
|
|
else:
|
|
try:
|
|
self.storage_conn.record_metering_data(data)
|
|
except Exception as err:
|
|
LOG.error('Failed to record metering data: %s', err)
|
|
LOG.exception(err)
|