From 07401e84086dea28a0c6d7cb3a1fd7f0b94011c3 Mon Sep 17 00:00:00 2001
From: ac2550 <ac2550@intl.att.com>
Date: Mon, 10 Sep 2018 15:32:48 +0200
Subject: [PATCH 1/1] Upgrade ELK to 6.1.3

Issue-ID: CLAMP-219
Change-Id: I2545d92b92e9a805122ca54d103865d12769cfe8
Signed-off-by: ac2550 <ac2550@intl.att.com>
---
 extra/docker/elk/docker-compose.yml          | 11 ++++++++---
 extra/docker/elk/logstash-conf/logstash.conf |  8 ++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/extra/docker/elk/docker-compose.yml b/extra/docker/elk/docker-compose.yml
index 3b7284d5..2f1ce246 100644
--- a/extra/docker/elk/docker-compose.yml
+++ b/extra/docker/elk/docker-compose.yml
@@ -2,16 +2,20 @@ version: '3.1'
 
 services:
   elasticsearch:
-    image: elasticsearch
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.1.3
     ports:
       - 9200:9200
     networks:
       es_net:
         aliases:
           - elasticsearch
+    environment:
+      - cluster.name=docker-cluster
+      - bootstrap.memory_lock=false
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 
   logstash:
-    image: logstash
+    image: docker.elastic.co/logstash/logstash:6.1.3
     volumes:
       - ./logstash-conf:/config-dir
     command: logstash -f /config-dir/logstash.conf
@@ -28,9 +32,10 @@ services:
       - event_topic=EVENT_TOPIC
       - notification_topic=NOTIFICATION_TOPIC
       - request_topic=REQUEST_TOPIC
+      - elasticsearch_hosts=elasticsearch
 
   kibana:
-    image: kibana
+    image: docker.elastic.co/kibana/kibana:6.1.3
     ports:
       - 5601:5601
     depends_on:
diff --git a/extra/docker/elk/logstash-conf/logstash.conf b/extra/docker/elk/logstash-conf/logstash.conf
index 0a2caf2f..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 => 60
         codec => "plain"
+        schedule => { "every" => "1m"  }
   }
 }
 
@@ -93,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
 
         }
-- 
2.16.6