X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=extra%2Fdocker%2Felk%2Flogstash-conf%2Flogstash.conf;h=a56c5c2eb587e3c479536d8e4bc41ededade25bd;hb=07401e84086dea28a0c6d7cb3a1fd7f0b94011c3;hp=4a7b151d0dae56c77da84a66e2f64e312fa81634;hpb=ba939626315ea48a9c41a8a4fd0b7c052d9dce00;p=clamp.git

diff --git a/extra/docker/elk/logstash-conf/logstash.conf b/extra/docker/elk/logstash-conf/logstash.conf
index 4a7b151d..a56c5c2e 100644
--- a/extra/docker/elk/logstash-conf/logstash.conf
+++ b/extra/docker/elk/logstash-conf/logstash.conf
@@ -28,8 +28,8 @@ input {
         }
         socket_timeout => 30
         request_timeout => 30
-        interval => 15
         codec => "plain"
+        schedule => { "every" => "1m"  }
   }
 }
 
@@ -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 ]
@@ -91,15 +93,15 @@ output {
     if [http_request_failure] {
         elasticsearch {
             codec => "json"
-            hosts => [elasticsearch]
+            hosts => ["${elasticsearch_hosts}"]
             index => "errors-%{+YYYY.MM.DD}"
             doc_as_upsert => true
         }
     } else {
         elasticsearch {
             codec => "json"
-            hosts => [elasticsearch]
-            index => "logstash-%{+YYYY.MM.DD}" # creates daily indexes
+            hosts => ["${elasticsearch_hosts}"]
+            index => "events-%{+YYYY.MM.DD}" # creates daily indexes
             doc_as_upsert => true
 
         }