diff --git a/etc/monasca-transform.conf b/etc/monasca-transform.conf index d4aac15..da4c3eb 100644 --- a/etc/monasca-transform.conf +++ b/etc/monasca-transform.conf @@ -17,6 +17,7 @@ adapter = monasca_transform.messaging.adapter:KafkaMessageAdapter topic = metrics brokers = localhost:9092 publish_kafka_project_id = d2cb21079930415a9f2a33588b9f2bb6 +publish_region = useast adapter_pre_hourly = monasca_transform.messaging.adapter:KafkaMessageAdapterPreHourly topic_pre_hourly = metrics_pre_hourly diff --git a/monasca_transform/component/insert/__init__.py b/monasca_transform/component/insert/__init__.py index 415b0b9..2692df5 100644 --- a/monasca_transform/component/insert/__init__.py +++ b/monasca_transform/component/insert/__init__.py @@ -95,7 +95,7 @@ class InsertComponent(Component): # proper/valid tenant ID, aggregated metrics don't get persisted # to the Monasca DB. meta_part["tenantId"] = cfg.CONF.messaging.publish_kafka_project_id - meta_part["region"] = "useast" + meta_part["region"] = cfg.CONF.messaging.publish_region value_meta_part = {"record_count": instance_usage_dict.get( "record_count", 0), diff --git a/monasca_transform/config/config_initializer.py b/monasca_transform/config/config_initializer.py index 0269957..3aa5545 100644 --- a/monasca_transform/config/config_initializer.py +++ b/monasca_transform/config/config_initializer.py @@ -84,6 +84,9 @@ class ConfigInitializer(object): cfg.StrOpt('publish_kafka_project_id', default='111111', help='publish aggregated metrics tenant'), + cfg.StrOpt('publish_region', + default='useast', + help='publish aggregated metrics region'), cfg.StrOpt('adapter_pre_hourly', default='monasca_transform.messaging.adapter:' 'KafkaMessageAdapterPreHourly',