5181724ece
The cfg API is now available via the oslo-config library, so switch to
it and remove the copied-and-pasted version.
Add the 2013.1b3 tarball to tools/pip-requires - this will be changed
to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
will happen in time for grizzly final.
For each testenv in tox.ini which overrides the base testenv deps list,
explicitly include {pip,test}-requires in the list so that oslo-config
doesn't fail to install later when easy_install attempts to install
the tarball when doing 'python setup.py install'.
Retain dummy cfg.py file until keystoneclient middleware has been
updated (I18c450174277c8e2d15ed93879da6cd92074c27a).
Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
84 lines
2.8 KiB
Python
84 lines
2.8 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012-2013 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 oslo.config import cfg
|
|
from stevedore import driver
|
|
|
|
from ceilometer import agent
|
|
from ceilometer import extension_manager
|
|
from ceilometer import nova_client
|
|
from ceilometer.compute.virt import inspector as virt_inspector
|
|
from ceilometer.openstack.common import log
|
|
|
|
OPTS = [
|
|
cfg.ListOpt('disabled_compute_pollsters',
|
|
default=[],
|
|
help='list of compute agent pollsters to disable',
|
|
),
|
|
cfg.StrOpt('hypervisor_inspector',
|
|
default='libvirt',
|
|
help='Inspector to use for inspecting the hypervisor layer'),
|
|
]
|
|
|
|
cfg.CONF.register_opts(OPTS)
|
|
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
def get_hypervisor_inspector():
|
|
try:
|
|
namespace = 'ceilometer.compute.virt'
|
|
mgr = driver.DriverManager(namespace,
|
|
cfg.CONF.hypervisor_inspector,
|
|
invoke_on_load=True)
|
|
return mgr.driver
|
|
except ImportError as e:
|
|
LOG.error("Unable to load the hypervisor inspector: %s" % (e))
|
|
return virt_inspector.Inspector()
|
|
|
|
|
|
class AgentManager(agent.AgentManager):
|
|
|
|
def __init__(self):
|
|
super(AgentManager, self).__init__(
|
|
extension_manager.ActivatedExtensionManager(
|
|
namespace='ceilometer.poll.compute',
|
|
disabled_names=cfg.CONF.disabled_compute_pollsters,
|
|
),
|
|
)
|
|
self._inspector = get_hypervisor_inspector()
|
|
|
|
def poll_instance(self, context, instance):
|
|
"""Poll one instance."""
|
|
self.pollster_manager.map(self.publish_counters_from_one_pollster,
|
|
manager=self,
|
|
context=context,
|
|
instance=instance)
|
|
|
|
def periodic_tasks(self, context, raise_on_error=False):
|
|
"""Tasks to be run at a periodic interval."""
|
|
nv = nova_client.Client()
|
|
for instance in nv.instance_get_all_by_host(cfg.CONF.host):
|
|
if getattr(instance, 'OS-EXT-STS:vm_state', None) != 'error':
|
|
self.poll_instance(context, instance)
|
|
|
|
@property
|
|
def inspector(self):
|
|
return self._inspector
|