Merge "Upgrade ELK to 6.1.3"

2 files changed, 12 insertions, 7 deletions

diff --git a/extra/docker/elk/docker-compose.yml b/extra/docker/elk/docker-compose.yml
index 388c3187..3b5571e3 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
       - ./logstash-input:/log-input
@@ -29,9 +33,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 c511995f..2b71686f 100644
--- a/extra/docker/elk/logstash-conf/logstash.conf
+++ b/extra/docker/elk/logstash-conf/logstash.conf
@@ -31,8 +31,8 @@ input {
         }
         socket_timeout => 30
         request_timeout => 30
-        interval => 60
         codec => "plain"
+        schedule => { "every" => "1m"  }
   }
 }
 
@@ -131,15 +131,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
 
         }