diff --git a/ceilometer/dispatcher/__init__.py b/ceilometer/dispatcher/__init__.py index 9a390ba817..a994df9017 100644 --- a/ceilometer/dispatcher/__init__.py +++ b/ceilometer/dispatcher/__init__.py @@ -31,7 +31,7 @@ OPTS = [ default=['database'], help='Dispatchers to process metering data.'), cfg.MultiStrOpt('event_dispatchers', - default=['database'], + default=[], deprecated_name='dispatcher', help='Dispatchers to process event data.'), ] diff --git a/ceilometer/dispatcher/database.py b/ceilometer/dispatcher/database.py index eb381265bd..9ee881b549 100644 --- a/ceilometer/dispatcher/database.py +++ b/ceilometer/dispatcher/database.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +from debtcollector import removals from oslo_log import log from oslo_utils import timeutils @@ -79,6 +80,9 @@ class MeterDatabaseDispatcher(dispatcher.MeterDispatcherBase, raise +@removals.removed_class("EventDatabaseDispatcher", + message="Use panko instead", + removal_version="8.0.0") class EventDatabaseDispatcher(dispatcher.EventDispatcherBase, DatabaseDispatcher): CONNECTION_TYPE = 'event' diff --git a/ceilometer/tests/unit/test_collector.py b/ceilometer/tests/unit/test_collector.py index c57c797373..9781d280c1 100644 --- a/ceilometer/tests/unit/test_collector.py +++ b/ceilometer/tests/unit/test_collector.py @@ -36,6 +36,7 @@ class TestEventDispatcherVerifier(base.BaseTestCase): self.conf.import_opt('telemetry_secret', 'ceilometer.publisher.utils', 'publisher') + self.conf.set_override("event_dispatchers", ['database']) self.useFixture(mockpatch.Patch( 'ceilometer.dispatcher.database.EventDatabaseDispatcher', new=FakeDispatcher)) diff --git a/releasenotes/notes/deprecated_database_event_dispatcher_panko-607d558c86a90f17.yaml b/releasenotes/notes/deprecated_database_event_dispatcher_panko-607d558c86a90f17.yaml new file mode 100644 index 0000000000..939d55c1fe --- /dev/null +++ b/releasenotes/notes/deprecated_database_event_dispatcher_panko-607d558c86a90f17.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - The event database dispatcher is now deprecated. It has been moved to a new + project, alongside the Ceilometer API for /v2/events, called Panko.