Add aliases for direct publisher

Deprecate the direct publisher in favor of explicit publisher name like 'gnocchi://', 'database://', 'file://', ... Change-Id: I11991352e55c7efc2fa808d429075a060fdcd29e
openstack · Nov 15, 2016 · f843b78 · f843b78
1 parent 7ff3ee4
commit f843b78
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/ceilometer/publisher/direct.py b/ceilometer/publisher/direct.py
@@ -17,7 +17,7 @@
 from stevedore import driver
 import stevedore.exception
 
-from ceilometer.i18n import _LE
+from ceilometer.i18n import _LE, _LW
 from ceilometer import publisher
 from ceilometer.publisher import utils
 
@@ -37,8 +37,15 @@ class DirectPublisher(publisher.ConfigPublisherBase):
     """
     def __init__(self, conf, parsed_url):
         super(DirectPublisher, self).__init__(conf, parsed_url)
+        default_dispatcher = parsed_url.scheme
+        if default_dispatcher == 'direct':
+            LOG.warning(_LW('Direct publisher is deprecated for removal. Use '
+                            'an explicit publisher instead, e.g. "gnocchi", '
+                            '"database", "file", ...'))
+            default_dispatcher = 'database'
         options = urlparse.parse_qs(parsed_url.query)
-        self.dispatcher_name = options.get('dispatcher', ['database'])[-1]
+        self.dispatcher_name = options.get('dispatcher',
+                                           [default_dispatcher])[-1]
         self._sample_dispatcher = None
         self._event_dispatcher = None
 

diff --git a/setup.cfg b/setup.cfg
@@ -245,13 +245,21 @@ ceilometer.publisher =
     direct = ceilometer.publisher.direct:DirectPublisher
     kafka = ceilometer.publisher.kafka_broker:KafkaBrokerPublisher
     http = ceilometer.publisher.http:HttpPublisher
+    gnocchi = ceilometer.publisher.direct:DirectPublisher
+    database = ceilometer.publisher.direct:DirectPublisher
+    file_alt = ceilometer.publisher.direct:DirectPublisher
+    http_alt = ceilometer.publisher.direct:DirectPublisher
 
 ceilometer.event.publisher =
     test = ceilometer.publisher.test:TestPublisher
     direct = ceilometer.publisher.direct:DirectPublisher
     notifier = ceilometer.publisher.messaging:EventNotifierPublisher
     kafka = ceilometer.publisher.kafka_broker:KafkaBrokerPublisher
     http = ceilometer.publisher.http:HttpPublisher
+    gnocchi = ceilometer.publisher.direct:DirectPublisher
+    database = ceilometer.publisher.direct:DirectPublisher
+    file_alt = ceilometer.publisher.direct:DirectPublisher
+    http_alt = ceilometer.publisher.direct:DirectPublisher
 
 ceilometer.event.trait_plugin =
     split = ceilometer.event.trait_plugins:SplitterTraitPlugin