From 77f68bad116519d02d5ae89d34dc30c54a66220d Mon Sep 17 00:00:00 2001 From: Ryan Brandt Date: Wed, 16 Dec 2015 13:25:39 -0700 Subject: [PATCH] Pass link and lifecycle state in state transitions Requires changes to monasca-common, monasca-thresh to use Change-Id: I04bc93894f7a674319b32837092188d98a112266 --- java/src/main/java/monasca/api/app/AlarmService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/src/main/java/monasca/api/app/AlarmService.java b/java/src/main/java/monasca/api/app/AlarmService.java index 391028657..00776242c 100644 --- a/java/src/main/java/monasca/api/app/AlarmService.java +++ b/java/src/main/java/monasca/api/app/AlarmService.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. + * Copyright (c) 2014-2016 Hewlett Packard Enterprise Development Company, L.P. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at @@ -127,7 +127,7 @@ public class AlarmService { Map subAlarms = repo.findAlarmSubExpressions(alarmId); String event = Serialization.toJson(new AlarmUpdatedEvent(alarmId, alarmDef.getId(), - tenantId, alarm.getMetrics(), subAlarms, newState, oldState)); + tenantId, alarm.getMetrics(), subAlarms, newState, oldState, newLink, newLifecycleState)); producer.send(new KeyedMessage<>(config.eventsTopic, String.valueOf(messageCount++), event)); // Notify interested parties of transitioned alarm state @@ -135,7 +135,7 @@ public class AlarmService { event = Serialization.toJson(new AlarmStateTransitionedEvent(tenantId, alarmId, alarmDef .getId(), alarm.getMetrics(), alarmDef.getName(), alarmDef.getDescription(), - oldState, newState, alarmDef.getSeverity(), alarmDef.isActionsEnabled(), + oldState, newState, alarmDef.getSeverity(), newLink, newLifecycleState, alarmDef.isActionsEnabled(), stateChangeReasonFor(oldState, newState), null, System.currentTimeMillis())); producer.send(new KeyedMessage<>(config.alarmStateTransitionsTopic, String.valueOf(messageCount++), event)); }