diff options
| author | Zuul <zuul@review.opendev.org> | 2022-12-08 09:58:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-12-08 09:58:40 +0000 |
| commit | 341ec078279fe611c97187049139bfb5243e6d74 (patch) | |
| tree | 84c65154bc4400632567e7364d68ee3686f84d4d | |
| parent | 2a267388b6888cddf7dcc1910c5d5f00712ceb3a (diff) | |
| parent | 8e57a3a6f34fba3d89775b8b937b83524497dcfd (diff) | |
| download | ceilometer-341ec078279fe611c97187049139bfb5243e6d74.tar.gz | |
Merge "Exclude metrics from "service" project"
| -rw-r--r-- | ceilometer/publisher/gnocchi.py | 4 | ||||
| -rw-r--r-- | ceilometer/tests/unit/publisher/test_gnocchi.py | 4 | ||||
| -rw-r--r-- | devstack/plugin.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ceilometer/publisher/gnocchi.py b/ceilometer/publisher/gnocchi.py index 22cebdab..19f186c7 100644 --- a/ceilometer/publisher/gnocchi.py +++ b/ceilometer/publisher/gnocchi.py @@ -285,9 +285,9 @@ class GnocchiPublisher(publisher.ConfigPublisherBase): name=self.filter_project, domain=self.filter_domain) except ka_exceptions.NotFound: - LOG.warning('filtered project not found in keystone,' + LOG.warning('project %s not found in keystone,' ' ignoring the filter_project ' - 'option') + 'option', self.filter_project) self.filter_project = None return None except Exception: diff --git a/ceilometer/tests/unit/publisher/test_gnocchi.py b/ceilometer/tests/unit/publisher/test_gnocchi.py index b9ecdc1f..741594d5 100644 --- a/ceilometer/tests/unit/publisher/test_gnocchi.py +++ b/ceilometer/tests/unit/publisher/test_gnocchi.py @@ -339,9 +339,9 @@ class PublisherTest(base.BaseTestCase): def test_activity_gnocchi_project_not_found(self, logger): self.ks_client.projects.find.side_effect = ka_exceptions.NotFound self._do_test_activity_filter(2) - logger.warning.assert_called_with('filtered project not found in ' + logger.warning.assert_called_with('project %s not found in ' 'keystone, ignoring the ' - 'filter_project option') + 'filter_project option', 'service') def test_activity_filter_match_swift_event(self): self.samples[0].name = 'storage.objects.outgoing.bytes' diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 616f5725..c475be44 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -208,7 +208,7 @@ function _ceilometer_configure_storage_backend { if [ "$CEILOMETER_BACKEND" = 'none' ] ; then echo_summary "All Ceilometer backends seems disabled, set \$CEILOMETER_BACKEND to select one." elif [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then - sed -i "s/gnocchi:\/\//gnocchi:\/\/?archive_policy=${GNOCCHI_ARCHIVE_POLICY}\&filter_project=gnocchi_swift/" $CEILOMETER_CONF_DIR/event_pipeline.yaml $CEILOMETER_CONF_DIR/pipeline.yaml + sed -i "s/gnocchi:\/\//gnocchi:\/\/?archive_policy=${GNOCCHI_ARCHIVE_POLICY}\&filter_project=service/" $CEILOMETER_CONF_DIR/event_pipeline.yaml $CEILOMETER_CONF_DIR/pipeline.yaml ! [[ $DEVSTACK_PLUGINS =~ 'gnocchi' ]] && configure_gnocchi else die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND" |