openstack
/
monasca-persister
Code Issues Proposed changes

Merge "Store {} when value_meta is empty"

This commit is contained in:
Jenkins 2015-10-14 16:01:45 +00:00 committed by Gerrit Code Review
parent 9b1f5b60cc f88f71c51f
commit d9436392e9
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java
View File

@ -95,9 +95,9 @@ public class InfluxV9MetricRepo extends InfluxMetricRepo {
String valueMetaJSONString = measurement.getValueMetaJSONString();
if (valueMetaJSONString == null) {
if (valueMetaJSONString == null || valueMetaJSONString.isEmpty()) {
valueMap.put("value_meta", "");
valueMap.put("value_meta", "{}");
} else {

5
monasca_persister/persister.py
View File

@ -535,7 +535,7 @@ class MetricPersister(AbstractPersister):
else:
value_meta = ''
value_meta = {}
LOG.debug('value_meta: %s', value_meta)
@ -551,8 +551,7 @@ class MetricPersister(AbstractPersister):
"fields": {
"value": value,
"value_meta": json.dumps(value_meta,
ensure_ascii=False).encode(
'utf8') if value_meta else value_meta.encode('utf8')
ensure_ascii=False).encode('utf8')
},
"tags": tags}