File fix-for-influxdb-1.1.patch of Package openstack-monasca-persister-java
commit e5d6fd205cf35d1cb95b3776bc507e4f27978467
Author: Kamil Choroba <kamil.choroba@est.fujitsu.com>
Date: Wed Mar 15 13:39:31 2017 +0100
Fix for Influxdb 1.1
This fix creates a correct InfluxPoint from
an AlarmStateTransitionedEvent. And it
refactores the value_meta handling for metrics.
Change-Id: Id7a1402fccc7dafd88fa3d9fb5a61ffb12e13383
diff --git a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java
index bbd6de62b5dd..2c5b35cb33a3 100644
--- a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java
+++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java
@@ -75,6 +75,8 @@ public class InfluxV9AlarmRepo extends InfluxAlarmRepo {
Map<String, Object> valueMap = new HashMap<>();
+ Map<String, String> tags = new HashMap<>();
+
if (event.tenantId == null) {
logger.error("[{}]: tenant id cannot be null. Dropping alarm state history event.", id);
@@ -83,7 +85,7 @@ public class InfluxV9AlarmRepo extends InfluxAlarmRepo {
} else {
- valueMap.put("tenant_id", event.tenantId);
+ tags.put("tenant_id", event.tenantId);
}
if (event.alarmId == null) {
@@ -94,27 +96,30 @@ public class InfluxV9AlarmRepo extends InfluxAlarmRepo {
} else {
- valueMap.put("alarm_id", event.alarmId);
+ tags.put("alarm_id", event.alarmId);
}
if (event.metrics == null) {
logger.error("[{}]: metrics cannot be null. Settings metrics to empty JSON", id);
- valueMap.put("metrics", "{}");
+ valueMap.put("metrics", "\"{}\"");
} else {
try {
- valueMap.put("metrics", this.objectMapper.writeValueAsString(event.metrics));
+ valueMap.put("metrics",
+ new StringBuilder().append('"').
+ append(this.objectMapper.writeValueAsString(event.metrics)).
+ append('"').toString());
} catch (JsonProcessingException e) {
logger.error("[{}]: failed to serialize metrics {}", id, event.metrics, e);
logger.error("[{}]: setting metrics to empty JSON", id);
- valueMap.put("metrics", "{}");
+ valueMap.put("metrics", "\"{}\"");
}
}
@@ -123,11 +128,12 @@ public class InfluxV9AlarmRepo extends InfluxAlarmRepo {
logger.error("[{}]: old state cannot be null. Setting old state to empty string.", id);
- valueMap.put("old_state", "");
+ valueMap.put("old_state", "\"\"");
} else {
- valueMap.put("old_state", event.oldState);
+ valueMap.put("old_state",
+ new StringBuilder().append('"').append(event.oldState).append('"').toString());
}
@@ -135,50 +141,57 @@ public class InfluxV9AlarmRepo extends InfluxAlarmRepo {
logger.error("[{}]: new state cannot be null. Setting new state to empty string.", id);
- valueMap.put("new_state", "");
+ valueMap.put("new_state", "\"\"");
} else {
- valueMap.put("new_state", event.newState);
+ valueMap.put("new_state",
+ new StringBuilder().append('"').append(event.newState).append('"').toString());
}
if (event.link == null) {
- valueMap.put("link", "");
+ valueMap.put("link", "\"\"");
} else {
- valueMap.put("link", event.link);
+ valueMap.put("link",
+ new StringBuilder().append('"').append(event.link).append('"').toString());
}
if (event.lifecycleState == null) {
- valueMap.put("lifecycle_state", "");
+ valueMap.put("lifecycle_state", "\"\"");
} else {
- valueMap.put("lifecycle_state", event.lifecycleState);
+ valueMap.put("lifecycle_state",
+ new StringBuilder().append('"').append(event.lifecycleState).
+ append('"').toString());
}
if (event.subAlarms == null) {
logger.debug("[{}]: sub alarms is null. Setting sub alarms to empty JSON", id);
- valueMap.put("sub_alarms", "[]");
+ valueMap.put("sub_alarms", "\"[]\"");
} else {
try {
- valueMap.put("sub_alarms", this.objectMapper.writeValueAsString(event.subAlarms));
+ valueMap.put("sub_alarms",
+ new StringBuilder().append('"').
+ append(this.objectMapper.writeValueAsString(event.subAlarms)).
+ append('"').toString());
} catch (JsonProcessingException e) {
logger.error("[{}]: failed to serialize sub alarms {}", id, event.subAlarms, e);
logger.error("[{}]: Setting sub_alarms to empty JSON", id);
- valueMap.put("sub_alarms", "[]");
+ valueMap.put("sub_alarms", "\"[]\"");
}
@@ -188,23 +201,19 @@ public class InfluxV9AlarmRepo extends InfluxAlarmRepo {
logger.error("[{}]: reason cannot be null. Setting reason to empty string.", id);
- valueMap.put("reason", "");
+ valueMap.put("reason", "\"\"");
} else {
- valueMap.put("reason", event.stateChangeReason);
+ valueMap.put("reason",
+ new StringBuilder().append('"').append(event.stateChangeReason).
+ append('"').toString());
}
- valueMap.put("reason_data", "{}");
+ valueMap.put("reason_data", "\"{}\"");
Long dateTime = new DateTime(event.timestamp, DateTimeZone.UTC).getMillis();
- Map<String, String> tags = new HashMap<>();
-
- tags.put("tenant_id", event.tenantId);
-
- tags.put("alarm_id", event.alarmId);
-
InfluxPoint
influxPoint =
new InfluxPoint(ALARM_STATE_HISTORY_NAME, tags, dateTime, valueMap);
diff --git a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java
index 3410e262fb7d..74e058f8c6cc 100644
--- a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java
+++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java
@@ -26,7 +26,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import scala.collection.mutable.StringBuilder;
import io.dropwizard.setup.Environment;
import monasca.persister.repository.RepoException;
@@ -91,23 +90,23 @@ public class InfluxV9MetricRepo extends InfluxMetricRepo {
private Map<String, Object> buildValueMap(Measurement measurement) {
- Map<String, Object> valueMap = new HashMap<String, Object>();
- Map<String, String> valueMeta = measurement.getValueMeta();
-
- if (valueMeta != null && valueMeta.size() != 0) {
- /*
- * Refactor value meta strings like:
- * "error: error(111, 'Connection refused'). * Connection failed after 3 ms"
- * to "error: error(111, \"Connection refused\"). Connection failed after 3 ms"
- * Otherwise persisting to influx will fail.
- */
- for (Map.Entry<String, String> entry : valueMeta.entrySet()) {
- valueMap.put(entry.getKey(),
- new StringBuilder("\"").append(entry.getValue().replaceAll("'", "\\\\\"")).append("\""));
- }
- }
+ Map<String, Object> valueMap = new HashMap<>();
valueMap.put("value", measurement.getValue());
+
+ String valueMetaJSONString = measurement.getValueMetaJSONString();
+
+ if (valueMetaJSONString == null || valueMetaJSONString.isEmpty()) {
+
+ valueMap.put("value_meta", "\"{}\"");
+
+ } else {
+
+ valueMap.put("value_meta",
+ new StringBuilder().append('"').append(valueMetaJSONString).append('"').toString());
+
+ }
+
return valueMap;
}
