From b999ecd43c5eaea9abb6ef5bfef14d6bcf92fd6c Mon Sep 17 00:00:00 2001 From: Michael James Hoppal Date: Tue, 24 Feb 2015 10:01:06 -0700 Subject: [PATCH] Adding subalarm column for alarm state transition Change-Id: Id05d27472e7a1048020b7d391cd600328f088375 --- .../java/monasca/persister/repository/InfluxV8AlarmRepo.java | 3 ++- .../java/monasca/persister/repository/InfluxV9AlarmRepo.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/java/src/main/java/monasca/persister/repository/InfluxV8AlarmRepo.java b/java/src/main/java/monasca/persister/repository/InfluxV8AlarmRepo.java index 36f98420..1d1f2451 100644 --- a/java/src/main/java/monasca/persister/repository/InfluxV8AlarmRepo.java +++ b/java/src/main/java/monasca/persister/repository/InfluxV8AlarmRepo.java @@ -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); } diff --git a/java/src/main/java/monasca/persister/repository/InfluxV9AlarmRepo.java b/java/src/main/java/monasca/persister/repository/InfluxV9AlarmRepo.java index 711ee469..d9b442a3 100644 --- a/java/src/main/java/monasca/persister/repository/InfluxV9AlarmRepo.java +++ b/java/src/main/java/monasca/persister/repository/InfluxV9AlarmRepo.java @@ -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", "{}");