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
167 lines
6.5 KiB
Python
167 lines
6.5 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 sys
|
|
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
# python-apt is not installed as part of test-requirements but is imported by
|
|
# some charmhelpers modules so create a fake import.
|
|
mock_apt = MagicMock()
|
|
sys.modules['apt'] = mock_apt
|
|
mock_apt.apt_pkg = MagicMock()
|
|
|
|
import ceilometer_utils as utils
|
|
|
|
from test_utils import CharmTestCase
|
|
|
|
|
|
TO_PATCH = [
|
|
'get_os_codename_package',
|
|
'templating',
|
|
'CeilometerServiceContext',
|
|
'config',
|
|
'get_os_codename_install_source',
|
|
'configure_installation_source',
|
|
'apt_install',
|
|
'apt_update',
|
|
'apt_upgrade',
|
|
'log',
|
|
'os_application_version_set',
|
|
'token_cache_pkgs',
|
|
'enable_memcache',
|
|
]
|
|
|
|
|
|
class CeilometerUtilsTest(CharmTestCase):
|
|
|
|
def setUp(self):
|
|
super(CeilometerUtilsTest, self).setUp(utils, TO_PATCH)
|
|
|
|
def tearDown(self):
|
|
super(CeilometerUtilsTest, self).tearDown()
|
|
|
|
def test_register_configs(self):
|
|
self.get_os_codename_package.return_value = 'icehouse'
|
|
self.enable_memcache.return_value = False
|
|
configs = utils.register_configs()
|
|
registered_configs = [c[0][0] for c in configs.register.call_args_list]
|
|
self.assertTrue(utils.CEILOMETER_CONF in registered_configs)
|
|
self.assertFalse(utils.MEMCACHED_CONF in registered_configs)
|
|
|
|
def test_register_configs_newton(self):
|
|
self.get_os_codename_package.return_value = 'newton'
|
|
self.enable_memcache.return_value = True
|
|
configs = utils.register_configs()
|
|
registered_configs = [c[0][0] for c in configs.register.call_args_list]
|
|
for config in utils.CONFIG_FILES.keys():
|
|
self.assertTrue(config in registered_configs)
|
|
|
|
def test_restart_map(self):
|
|
self.get_os_codename_package.return_value = 'icehouse'
|
|
self.enable_memcache.return_value = False
|
|
restart_map = utils.restart_map()
|
|
self.assertEqual(restart_map, {
|
|
'/etc/ceilometer/ceilometer.conf': ['ceilometer-agent-compute'],
|
|
})
|
|
|
|
def test_restart_map_newton(self):
|
|
self.get_os_codename_package.return_value = 'newton'
|
|
self.enable_memcache.return_value = True
|
|
restart_map = utils.restart_map()
|
|
expect = {
|
|
'/etc/ceilometer/ceilometer.conf': ['ceilometer-agent-compute'],
|
|
'/etc/memcached.conf': ['memcached'],
|
|
}
|
|
self.assertEqual(restart_map, expect)
|
|
|
|
def test_restart_map_queens(self):
|
|
self.get_os_codename_package.return_value = 'queens'
|
|
restart_map = utils.restart_map()
|
|
expect = {
|
|
'/etc/ceilometer/ceilometer.conf': ['ceilometer-agent-compute'],
|
|
'/etc/memcached.conf': ['memcached'],
|
|
'/etc/ceilometer/polling.yaml': ['ceilometer-agent-compute'],
|
|
}
|
|
self.assertEqual(restart_map, expect)
|
|
|
|
def test_assess_status(self):
|
|
with patch.object(utils, 'assess_status_func') as asf:
|
|
callee = MagicMock()
|
|
asf.return_value = callee
|
|
utils.assess_status('test-config')
|
|
asf.assert_called_once_with('test-config')
|
|
callee.assert_called_once_with()
|
|
self.os_application_version_set.assert_called_with(
|
|
utils.VERSION_PACKAGE
|
|
)
|
|
|
|
@patch.object(utils, 'REQUIRED_INTERFACES')
|
|
@patch.object(utils, 'services')
|
|
@patch.object(utils, 'make_assess_status_func')
|
|
def test_assess_status_func(self,
|
|
make_assess_status_func,
|
|
services,
|
|
REQUIRED_INTERFACES):
|
|
services.return_value = 's1'
|
|
utils.assess_status_func('test-config')
|
|
# ports=None whilst port checks are disabled.
|
|
make_assess_status_func.assert_called_once_with(
|
|
'test-config', REQUIRED_INTERFACES, services='s1', ports=None)
|
|
|
|
def test_pause_unit_helper(self):
|
|
with patch.object(utils, '_pause_resume_helper') as prh:
|
|
utils.pause_unit_helper('random-config')
|
|
prh.assert_called_once_with(utils.pause_unit, 'random-config')
|
|
with patch.object(utils, '_pause_resume_helper') as prh:
|
|
utils.resume_unit_helper('random-config')
|
|
prh.assert_called_once_with(utils.resume_unit, 'random-config')
|
|
|
|
@patch.object(utils, 'services')
|
|
def test_pause_resume_helper(self, services):
|
|
f = MagicMock()
|
|
services.return_value = 's1'
|
|
with patch.object(utils, 'assess_status_func') as asf:
|
|
asf.return_value = 'assessor'
|
|
utils._pause_resume_helper(f, 'some-config')
|
|
asf.assert_called_once_with('some-config')
|
|
# ports=None whilst port checks are disabled.
|
|
f.assert_called_once_with('assessor', services='s1', ports=None)
|
|
|
|
def test_determine_purge_packages(self):
|
|
'Ensure no packages are identified for purge prior to rocky'
|
|
self.get_os_codename_package.return_value = 'queens'
|
|
self.assertEqual(utils.determine_purge_packages(), [])
|
|
|
|
def test_determine_purge_packages_rocky(self):
|
|
'Ensure python packages are identified for purge at rocky'
|
|
self.get_os_codename_package.return_value = 'rocky'
|
|
self.assertEqual(utils.determine_purge_packages(),
|
|
[p for p in utils.CEILOMETER_AGENT_PACKAGES
|
|
if p.startswith('python-')])
|
|
|
|
def test_get_packages_queens(self):
|
|
self.get_os_codename_package.return_value = 'queens'
|
|
self.token_cache_pkgs.return_value = []
|
|
self.assertEqual(utils.get_packages(),
|
|
utils.CEILOMETER_AGENT_PACKAGES)
|
|
|
|
def test_get_packages_rocky(self):
|
|
self.get_os_codename_package.return_value = 'rocky'
|
|
self.token_cache_pkgs.return_value = []
|
|
self.assertEqual(sorted(utils.get_packages()),
|
|
sorted([p for p in utils.CEILOMETER_AGENT_PACKAGES
|
|
if not p.startswith('python-')] +
|
|
['python3-ceilometer', 'python3-memcache']))
|