From fa98d97219ebefe5dc9e8d2adcce4d82255e55a4 Mon Sep 17 00:00:00 2001
From: CoderBear801 <coderxiong@gmail.com>
Date: Tue, 22 Oct 2019 14:46:15 -0700
Subject: [PATCH] fix: Abstract input log folder to parameters issue:
 https://github.com/Telenav/osrm-backend/issues/65

---
 docker-orchestration/elk-compose/docker-elk/.env           | 1 +
 docker-orchestration/elk-compose/docker-elk/README.md      | 7 ++++---
 .../elk-compose/docker-elk/docker-compose.yml              | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docker-orchestration/elk-compose/docker-elk/.env b/docker-orchestration/elk-compose/docker-elk/.env
index 311b6cb68..30a9ec872 100644
--- a/docker-orchestration/elk-compose/docker-elk/.env
+++ b/docker-orchestration/elk-compose/docker-elk/.env
@@ -1 +1,2 @@
 ELK_VERSION=7.3.1
+DATA_PATH=/Users/xunliu/Desktop/go/src/github.com/Telenav/logs/
\ No newline at end of file
diff --git a/docker-orchestration/elk-compose/docker-elk/README.md b/docker-orchestration/elk-compose/docker-elk/README.md
index 4a471440b..ced8c7295 100644
--- a/docker-orchestration/elk-compose/docker-elk/README.md
+++ b/docker-orchestration/elk-compose/docker-elk/README.md
@@ -1,10 +1,9 @@
 # ELK Stack
 
-Specify your log location in docker-compose.yml->logstash->volume mapping
+Specify your log location in .env file and change DATA_PATH there
 ```
 // change "/Users/xunliu/Desktop/git/elastic-example/data/" to your data location
-// later will abstract this to parameters
-/Users/xunliu/Desktop/git/elastic-example/data/:/data
+DATA_PATH=/Users/xunliu/Desktop/go/src/github.com/Telenav/logs/
 ```
 
 Start
@@ -20,6 +19,8 @@ docker-compose -f docker-compose.yml down -v
 You could go to following link for Kibana
 ```
 http://localhost:5601
+// username: elastic
+// password: changeme
 ```
 
 If you need one component specific logs, you could use
diff --git a/docker-orchestration/elk-compose/docker-elk/docker-compose.yml b/docker-orchestration/elk-compose/docker-elk/docker-compose.yml
index b99cda57a..c943b1c75 100644
--- a/docker-orchestration/elk-compose/docker-elk/docker-compose.yml
+++ b/docker-orchestration/elk-compose/docker-elk/docker-compose.yml
@@ -28,8 +28,9 @@ services:
       context: logstash/
       args:
         ELK_VERSION: $ELK_VERSION
+        DATA_PATH: $DATA_PATH
     volumes:
-      - /Users/xunliu/Desktop/git/elastic-example/data/:/data/
+      - ${DATA_PATH}:/data/
       - type: bind
         source: ./logstash/config/logstash.yml
         target: /usr/share/logstash/config/logstash.yml