From: Sébastien Determe <sd378r@intl.att.com>
Date: Tue, 11 Sep 2018 09:11:08 +0000 (+0000)
Subject: Merge "Upgrade ELK to 6.1.3"
X-Git-Tag: 6.0.0~11^2~655
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3aec59e72323d6b04640061ad8d1cd57f6f31e11;p=policy%2Fclamp.git

Merge "Upgrade ELK to 6.1.3"
---

3aec59e72323d6b04640061ad8d1cd57f6f31e11
diff --cc extra/docker/elk/docker-compose.yml
index 388c3187d,2f1ce2460..3b5571e31
--- a/extra/docker/elk/docker-compose.yml
+++ b/extra/docker/elk/docker-compose.yml
@@@ -9,12 -9,15 +9,16 @@@ services
        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
      command: logstash -f /config-dir/logstash.conf
      depends_on:
        - elasticsearch