From 5699adcc46128d0cb2084a68289917a36576079a Mon Sep 17 00:00:00 2001
From: Dariusz Smigiel <1412617+dasm@users.noreply.github.com>
Date: Tue, 18 Jun 2019 16:01:58 -0700
Subject: [PATCH] Bump stack to '6.8.0'

---
 .env                  |  4 ++--
 docker-compose.yml    | 12 ++++++------
 scripts/setup-beat.sh |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index c342d84..1d6946c 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
-TAG=6.6.0
-ELASTIC_VERSION=6.6.0
+TAG=6.8.0
+ELASTIC_VERSION=6.8.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 346dd61..e87d6a9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -94,7 +94,7 @@ services:
       - source: auditbeat.yml
         target: /usr/share/auditbeat/auditbeat.yml
       - source: auditbeat.keystore
-        target: /usr/share/auditbeat/auditbeat.keystore
+        target: /usr/share/auditbeat/data/auditbeat.keystore
       - source: ca.crt
         target: /usr/share/auditbeat/certs/ca/ca.crt
     # Auditbeat must run in the main process namespace.
@@ -120,7 +120,7 @@ services:
       - source: filebeat.yml
         target: /usr/share/filebeat/filebeat.yml
       - source: filebeat.keystore
-        target: /usr/share/filebeat/filebeat.keystore
+        target: /usr/share/filebeat/data/filebeat.keystore
       - source: ca.crt
         target: /usr/share/filebeat/certs/ca/ca.crt
     volumes:
@@ -141,7 +141,7 @@ services:
       - source: heartbeat.yml
         target: /usr/share/heartbeat/heartbeat.yml
       - source: heartbeat.keystore
-        target: /usr/share/heartbeat/heartbeat.keystore
+        target: /usr/share/heartbeat/data/heartbeat.keystore
       - source: ca.crt
         target: /usr/share/heartbeat/certs/ca/ca.crt
     volumes:
@@ -170,7 +170,7 @@ services:
       - source: metricbeat.yml
         target: /usr/share/metricbeat/metricbeat.yml
       - source: metricbeat.keystore
-        target: /usr/share/metricbeat/metricbeat.keystore
+        target: /usr/share/metricbeat/data/metricbeat.keystore
       - source: ca.crt
         target: /usr/share/metricbeat/certs/ca/ca.crt
     volumes:
@@ -204,7 +204,7 @@ services:
       - source: packetbeat.yml
         target: /usr/share/packetbeat/packetbeat.yml
       - source: packetbeat.keystore
-        target: /usr/share/packetbeat/packetbeat.keystore
+        target: /usr/share/packetbeat/data/packetbeat.keystore
       - source: ca.crt
         target: /usr/share/packetbeat/certs/ca/ca.crt
     volumes:
@@ -226,7 +226,7 @@ services:
       - source: apm-server.yml
         target: /usr/share/apm-server/apm-server.yml
       - source: apm-server.keystore
-        target: /usr/share/apm-server/apm-server.keystore
+        target: /usr/share/apm-server/data/apm-server.keystore
       - source: ca.crt
         target: /usr/share/apm-server/certs/ca/ca.crt
     volumes:
diff --git a/scripts/setup-beat.sh b/scripts/setup-beat.sh
index 57d6458..9341fef 100755
--- a/scripts/setup-beat.sh
+++ b/scripts/setup-beat.sh
@@ -15,7 +15,7 @@ chmod go-w /usr/share/$beat/$beat.yml
 echo "Creating keystore..."
 # create beat keystore
 ${beat} --strict.perms=false keystore create --force
-chown 1000 /usr/share/$beat/$beat.keystore
+chown 1000 /usr/share/$beat/data/$beat.keystore
 chmod go-w /usr/share/$beat/$beat.yml
 
 echo "adding ES_PASSWORD to keystore..."
@@ -28,5 +28,5 @@ echo "Setting up dashboards..."
 ${beat} --strict.perms=false setup -v
 
 echo "Copy keystore to ./config dir"
-cp /usr/share/$beat/$beat.keystore /config/$beat/$beat.keystore
+cp /usr/share/$beat/data/$beat.keystore /config/$beat/$beat.keystore
 chown 1000:1000 /config/$beat/$beat.keystore