From 417feb37f5b33e854b0d89e739df427326dd789c Mon Sep 17 00:00:00 2001 From: Deklan Dieterly Date: Fri, 15 May 2015 14:25:46 -0600 Subject: [PATCH] Include dimensions in measurement tags Change-Id: I0073790397957dec9424a88b4dccdbbb1fbfe68e --- monasca_persister/persister.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/monasca_persister/persister.py b/monasca_persister/persister.py index f6df1f2c..95103c9d 100644 --- a/monasca_persister/persister.py +++ b/monasca_persister/persister.py @@ -498,8 +498,8 @@ class MetricPersister(AbstractPersister): dimensions = {} if 'dimensions' in metric: for dimension_name in metric['dimensions']: - dimensions[dimension_name] = ( - metric['dimensions'][dimension_name]) + dimensions[dimension_name.encode('utf8')] = ( + metric['dimensions'][dimension_name].encode('utf8')) LOG.debug('dimension: %s : %s', dimension_name, dimensions[dimension_name]) @@ -519,6 +519,10 @@ class MetricPersister(AbstractPersister): LOG.debug('value_meta: %s', value_meta) + tags = dimensions + tags['_tenant_id'] = tenant_id.encode('utf8') + tags['_region'] = region.encode('utf8') + ts = time_stamp / 1000.0 data = {"name": metric_name.encode('utf8'), @@ -528,10 +532,7 @@ class MetricPersister(AbstractPersister): "value": value, "value_meta": json.dumps(value_meta, ensure_ascii=False).encode('utf8') }, - "tags": { - "_tenant_id": tenant_id.encode('utf8'), - "_region": region.encode('utf8') - }} + "tags": tags} LOG.debug(data)