openstack/monasca-persister
Code Issues Proposed changes

Merge "Adding subalarm column for alarm state transition"

Browse Source
This commit is contained in:
Jenkins 2015-02-25 02:25:08 +00:00 committed by Gerrit Code Review
commit 03b54c235c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/main/java/monasca/persister/repository/InfluxV8AlarmRepo.java
View File

@ -38,7 +38,7 @@ public class InfluxV8AlarmRepo extends InfluxAlarmRepo {
private static final String[]
COLUMN_NAMES =
{"tenant_id", "alarm_id", "metrics", "old_state", "new_state", "reason", "reason_data",
{"tenant_id", "alarm_id", "metrics", "old_state", "new_state", "sub_alarms", "reason", "reason_data",
"time"};
private final InfluxV8RepoWriter influxV8RepoWriter;
@ -73,6 +73,7 @@ public class InfluxV8AlarmRepo extends InfluxAlarmRepo {
builder.values(alarmStateTransitionedEvent.tenantId, alarmStateTransitionedEvent.alarmId,
this.objectMapper.writeValueAsString(alarmStateTransitionedEvent.metrics),
alarmStateTransitionedEvent.oldState, alarmStateTransitionedEvent.newState,
this.objectMapper.writeValueAsString(alarmStateTransitionedEvent.subAlarms),
alarmStateTransitionedEvent.stateChangeReason, "{}",
alarmStateTransitionedEvent.timestamp);
}

1
java/src/main/java/monasca/persister/repository/InfluxV9AlarmRepo.java
View File

@ -78,6 +78,7 @@ public class InfluxV9AlarmRepo extends InfluxAlarmRepo {
valueMap.put("metrics", this.objectMapper.writeValueAsString(event.metrics));
valueMap.put("old_state", event.oldState);
valueMap.put("new_state", event.newState);
valueMap.put("sub_alarms", this.objectMapper.writeValueAsString(event.subAlarms));
valueMap.put("reason", event.stateChangeReason);
valueMap.put("reason_data", "{}");