From 7b4b41ff28ae1ea0d3d411fa6acee2da2a4090fa Mon Sep 17 00:00:00 2001
From: Ryan Brandt <ryan.brandt@hp.com>
Date: Wed, 16 Dec 2015 14:19:04 -0700
Subject: [PATCH] Pass link and lifecycle state in state transitions

Requires changes to monasca-thresh

Change-Id: I93113bc854629d45f34cdff9205ee97f353f999a
---
 .../influxdb/InfluxV9AlarmRepo.java           | 20 ++++++++++++++++++-
 monasca_persister/persister.py                | 16 ++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

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 5548c803..86f267e3 100644
--- a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java
+++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+ * (C) Copyright 2014-2016 Hewlett Packard Enterprise Development Company LP
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,6 +146,24 @@ public class InfluxV9AlarmRepo extends InfluxAlarmRepo {
 
       }
 
+      if (event.link == null) {
+
+        valueMap.put("link", "");
+
+      } else {
+
+        valueMap.put("link", event.link);
+      }
+
+      if (event.lifecycleState == null) {
+
+        valueMap.put("lifecycle_state", "");
+
+      } else {
+
+        valueMap.put("lifecycle_state", event.lifecycleState);
+      }
+
       if (event.subAlarms == null) {
 
         logger.debug("[{}]: sub alarms is null. Setting sub alarms to empty JSON", id);
diff --git a/monasca_persister/persister.py b/monasca_persister/persister.py
index bd61c919..0794c62d 100644
--- a/monasca_persister/persister.py
+++ b/monasca_persister/persister.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+# (C) Copyright 2014-2016 Hewlett Packard Enterprise Development Company LP
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -484,7 +484,8 @@ class AlarmStateHistInfluxdbPersister(AbstractInfluxdbPersister):
 
     def process_message(self, message):
 
-        (alarm_id, metrics, new_state, old_state, state_change_reason,
+        (alarm_id, metrics, new_state, old_state, link,
+         lifecycle_state, state_change_reason,
          sub_alarms_json_snake_case, tenant_id,
          time_stamp) = parse_alarm_state_hist_message(
                 message)
@@ -501,6 +502,8 @@ class AlarmStateHistInfluxdbPersister(AbstractInfluxdbPersister):
                             'utf8'),
                     "new_state": new_state.encode('utf8'),
                     "old_state": old_state.encode('utf8'),
+                    "link": link.encode('utf8'),
+                    "lifecycle_state": lifecycle_state.encode('utf8'),
                     "reason": state_change_reason.encode('utf8'),
                     "reason_data": "{}".encode('utf8'),
                     "sub_alarms": sub_alarms_json_snake_case.encode('utf8')
@@ -630,6 +633,12 @@ def parse_alarm_state_hist_message(message):
     old_state = alarm_transitioned['oldState']
     LOG.debug('old state: %s', old_state)
 
+    link = alarm_transitioned['link'] or ""
+    LOG.debug('link: %s', link)
+
+    lifecycle_state = alarm_transitioned['lifecycleState'] or ""
+    LOG.debug('lifecycle_state: %s', lifecycle_state)
+
     state_change_reason = alarm_transitioned[
         'stateChangeReason']
     LOG.debug('state change reason: %s', state_change_reason)
@@ -661,7 +670,8 @@ def parse_alarm_state_hist_message(message):
 
         sub_alarms_json_snake_case = "[]"
 
-    return (alarm_id, metrics, new_state, old_state, state_change_reason,
+    return (alarm_id, metrics, new_state, old_state, link,
+            lifecycle_state, state_change_reason,
             sub_alarms_json_snake_case, tenant_id, time_stamp)
 
 def main_service():