From adabb3b9d56f40b165f913a294c2585978877d03 Mon Sep 17 00:00:00 2001 From: Eric K Date: Wed, 25 Jul 2018 10:19:27 -0700 Subject: [PATCH] minor renaming on monasca webhook driver driver name: monasca_webhook column names renamed to clarify the top level metric info is only the first metric attached to the alarm. Change-Id: I9746e29db36550572f877c65e05509fe1e3bac86 --- congress/datasources/monasca_driver.py | 10 +++++++--- congress/tests/helper.py | 2 +- setup.cfg | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/congress/datasources/monasca_driver.py b/congress/datasources/monasca_driver.py index b61727bf8..178667261 100644 --- a/congress/datasources/monasca_driver.py +++ b/congress/datasources/monasca_driver.py @@ -196,11 +196,15 @@ class MonascaWebhookDriver(datasource_driver.PushedDataSourceDriver): {'fieldname': 'old_state', 'translator': value_trans}, {'fieldname': 'message', 'translator': value_trans}, {'fieldname': 'tenant_id', 'translator': value_trans}, - {'fieldname': 'metrics_id', 'translator': value_trans}, - {'fieldname': 'metrics_name', 'translator': value_trans}, + {'fieldname': 'metrics_id', 'col': 'first_metric_id', + 'translator': value_trans}, + {'fieldname': 'metrics_name', 'col': 'first_metric_name', + 'translator': value_trans}, {'fieldname': 'metrics_dimensions_hostname', + 'col': 'first_metric_hostname', 'translator': value_trans}, {'fieldname': 'metrics_dimensions_service', + 'col': 'first_metric_service', 'translator': value_trans},) } TRANSLATORS = [alarm_notification_translator] @@ -216,7 +220,7 @@ class MonascaWebhookDriver(datasource_driver.PushedDataSourceDriver): @staticmethod def get_datasource_info(): result = {} - result['id'] = 'monasca_webhook_driver' + result['id'] = 'monasca_webhook' result['description'] = ('Datasource driver that accepts Monasca ' 'webhook alarm notifications.') result['config'] = {'persist_data': constants.OPTIONAL, diff --git a/congress/tests/helper.py b/congress/tests/helper.py index 89c0a9f34..c668b4ae6 100644 --- a/congress/tests/helper.py +++ b/congress/tests/helper.py @@ -516,7 +516,7 @@ def supported_drivers(): {"id": "vitrage", "description": "Datasource driver that accepts Vitrage " "webhook alarm notifications."}, - {"id": "monasca_webhook_driver", + {"id": "monasca_webhook", "description": "Datasource driver that accepts Monasca webhook " "alarm notifications."}] return results diff --git a/setup.cfg b/setup.cfg index 7eb994e6e..119719d45 100644 --- a/setup.cfg +++ b/setup.cfg @@ -63,7 +63,7 @@ congress.datasource.drivers = keystonev3 = congress.datasources.keystonev3_driver:KeystoneV3Driver mistral = congress.datasources.mistral_driver:MistralDriver monasca = congress.datasources.monasca_driver:MonascaDriver - monasca_webhook_driver = congress.datasources.monasca_driver:MonascaWebhookDriver + monasca_webhook = congress.datasources.monasca_driver:MonascaWebhookDriver murano = congress.datasources.murano_driver:MuranoDriver neutronv2 = congress.datasources.neutronv2_driver:NeutronV2Driver neutronv2_qos = congress.datasources.neutronv2_qos_driver:NeutronV2QosDriver