openstack
/
vitrage
Code Issues Proposed changes

Merge "Change parameter topic"

This commit is contained in:
Jenkins 2017-02-26 15:26:53 +00:00 committed by Gerrit Code Review
parent 664ce63119 5d287b916d
commit 7e41b9798d
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vitrage/api_handler/apis/event.py
View File

@ -57,6 +57,6 @@ class EventApis(EntityGraphApisBase):
get_transport(self.conf),
driver='messagingv2',
publisher_id=self.publisher,
topic='vitrage_notifications')
topics=['vitrage_notifications'])
except Exception as e:
LOG.info('Failed to initialize oslo notifier %s', str(e))

2
vitrage/datasources/collectd/collectd_vitrage/vitrageplugin.py
View File

@ -54,7 +54,7 @@ class VitrageNotifier(CollectDPlugin):
self.notifier = messaging.Notifier(transport,
driver='messagingv2',
publisher_id='collectd',
topic='vitrage_notifications')
topics=['vitrage_notifications'])
self.add_notification_callback(self.notify)
def notify(self, notification):

2
vitrage/datasources/zabbix/auxiliary/zabbix_vitrage.py
View File

@ -74,7 +74,7 @@ def main():
notifier = messaging.Notifier(transport,
driver=driver,
publisher_id=publisher,
topic='vitrage_notifications')
topics=['vitrage_notifications'])
alarm_status = args.topic.lower()
event_type = '%s.%s' % (ZABBIX_EVENT_TYPE, alarm_status)

2
vitrage/entity_graph/processor/notifier.py
View File

@ -39,7 +39,7 @@ class GraphNotifier(object):
get_transport(conf),
driver='messagingv2',
publisher_id='vitrage.graph',
topic=topic)
topics=[topic])
except Exception as e:
LOG.info('Graph Notifier - missing configuration %s' % str(e))

2
vitrage/messaging.py
View File

@ -64,7 +64,7 @@ class VitrageNotifier(object):
transport,
driver='messagingv2',
publisher_id=publisher_id,
topic=topic)
topics=[topic])
def notify(self, event_type, data):
LOG.debug('notify : ' + event_type + ' ' + str(data))