openstack/ceilometer
Code Issues Proposed changes

Merge "Add aliases for direct publisher"

Browse Source
This commit is contained in:
Jenkins
2017-01-02 11:30:39 +00:00
committed by Gerrit Code Review
parent 160efb9d13 f843b7882f
commit 841752d46e
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ceilometer/publisher/direct.py
View File

@@ -17,7 +17,7 @@ import six.moves.urllib.parse as urlparse
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

8
setup.cfg
View File

@@ -244,6 +244,10 @@ 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
@@ -251,6 +255,10 @@ ceilometer.event.publisher =
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