From: Sébastien Determe <sd378r@intl.att.com>
Date: Fri, 11 May 2018 09:51:24 +0000 (+0000)
Subject: Merge "Fix DCAE deploy/undeploy"
X-Git-Tag: v2.0.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=78e986b674f6ef6d3b94d5d62ddcd7a1f9071a8c;hp=3271165f71b5aee7bc9b5186ee2566c8dd2f2626;p=clamp.git

Merge "Fix DCAE deploy/undeploy"
---

diff --git a/extra/docker/elk/logstash-conf/logstash.conf b/extra/docker/elk/logstash-conf/logstash.conf
index dec47b3c..0a2caf2f 100644
--- a/extra/docker/elk/logstash-conf/logstash.conf
+++ b/extra/docker/elk/logstash-conf/logstash.conf
@@ -52,17 +52,19 @@ filter {
     }
     mutate { remove_field => [ "message" ] }
     # express timestamps in milliseconds instead of microseconds
-    ruby {
-        code => "event.set('closedLoopAlarmStart', Integer(event.get('closedLoopAlarmStart')))"
-    }
-    date {
-        match => [ "closedLoopAlarmStart", UNIX_MS ]
-        target => "closedLoopAlarmStart"
+    if [closedLoopAlarmStart] {
+        ruby {
+            code => "event.set('closedLoopAlarmStart', Integer(event.get('closedLoopAlarmStart')) / 1000)"
+        }
+        date {
+            match => [ "closedLoopAlarmStart", UNIX_MS ]
+            target => "closedLoopAlarmStart"
+        }
     }
 
     if [closedLoopAlarmEnd] {
         ruby {
-            code => "event.set('closedLoopAlarmEnd', Integer(event.get('closedLoopAlarmEnd')))"
+            code => "event.set('closedLoopAlarmEnd', Integer(event.get('closedLoopAlarmEnd')) / 1000)"
         }
         date {
             match => [ "closedLoopAlarmEnd", UNIX_MS ]