9fd4ea0a39
The ceilometer compute agent uses the default polling.yaml from the installed packages without the ability to configure its contents. This change adds two configuration options: 'polling-interval' and 'enable-all-pollsters', borrowing from the implementation in charm-ceilometer. We start off with a limited set of meters as before and if these are not enough, the user can set 'enable-all-pollsters' to 'true' to collect all available 'Pollster' metrics as listed in the documentation [1]. Verification: I tested this change on a cluster built from the OpenStack base bundle and the ceilometer and gnocchi charms. I confirmed that extra metrics that originate from the Compute Agent pollster (e.g. disk.device.read.latency) are available in gnocchi after setting 'enable-all-pollsters' to true. [1] https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html Closes-Bug: #1914442 Change-Id: I21c9a93e7dd91bced9365e44f3e6a5315976c3bb
90 lines
3.1 KiB
Python
90 lines
3.1 KiB
Python
# Copyright 2016 Canonical Ltd
|
|
#
|
|
# 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 ceilometer_contexts as contexts
|
|
from test_utils import CharmTestCase
|
|
|
|
TO_PATCH = [
|
|
'config',
|
|
'relation_get',
|
|
'relation_ids',
|
|
'related_units',
|
|
]
|
|
|
|
|
|
class CeilometerContextsTest(CharmTestCase):
|
|
|
|
def setUp(self):
|
|
super(CeilometerContextsTest, self).setUp(contexts, TO_PATCH)
|
|
self.config.side_effect = self.test_config.get
|
|
self.relation_get.side_effect = self.test_relation.get
|
|
|
|
def tearDown(self):
|
|
super(CeilometerContextsTest, self).tearDown()
|
|
|
|
def test_ceilometer_service_context(self):
|
|
self.relation_ids.return_value = ['ceilometer-service:0']
|
|
self.related_units.return_value = ['ceilometer/0']
|
|
data = {
|
|
'debug': True,
|
|
'verbose': False,
|
|
'rabbitmq_host': 'foo',
|
|
'rabbitmq_hosts': 'foo,bar',
|
|
'rabbitmq_user': 'bar',
|
|
'rabbitmq_password': 'baz',
|
|
'rabbitmq_virtual_host': 'openstack',
|
|
'rabbit_ssl_ca': None,
|
|
'rabbit_ssl_port': None,
|
|
'api_version': 3,
|
|
'auth_protocol': 'http',
|
|
'auth_host': 'keystone',
|
|
'auth_port': '80',
|
|
'service_protocol': 'http',
|
|
'service_host': 'keystone',
|
|
'service_port': '80',
|
|
'signing_dir': '/var/lib/ceilometer',
|
|
'admin_domain_name': 'admin_domain',
|
|
'admin_tenant_name': 'admin',
|
|
'admin_user': 'admin',
|
|
'admin_password': 'password',
|
|
'metering_secret': 'secret',
|
|
'polling_batch_size': 50,
|
|
}
|
|
self.test_relation.set(data)
|
|
self.assertEqual(contexts.CeilometerServiceContext()(), data)
|
|
|
|
def test_ceilometer_service_context_not_related(self):
|
|
self.relation_ids.return_value = []
|
|
self.assertEqual(contexts.CeilometerServiceContext()(), {})
|
|
|
|
def test_ceilometer_context(self):
|
|
self.assertEqual(contexts.CeilometerAgentContext()(), {
|
|
'polling_interval': 300,
|
|
'enable_all_pollsters': False,
|
|
})
|
|
|
|
def test_ceilometer_context_enable_all_pollsters(self):
|
|
self.test_config.set('enable-all-pollsters', True)
|
|
self.assertEqual(contexts.CeilometerAgentContext()(), {
|
|
'polling_interval': 300,
|
|
'enable_all_pollsters': True,
|
|
})
|
|
|
|
def test_ceilometer_context_polling_interval(self):
|
|
self.test_config.set('polling-interval', 600)
|
|
self.assertEqual(contexts.CeilometerAgentContext()(), {
|
|
'polling_interval': 600,
|
|
'enable_all_pollsters': False,
|
|
})
|