From bc349d6c4dc5e5a53507d00acb9833d1a026dbfd Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Tue, 8 Jan 2019 15:09:11 -0600
Subject: [PATCH] Update ELK instructions

The slides didn't mention to clone the git repo containing
the Compose file for the ELK stack. This is now fixed.

Also, the version numbers were not all correctly set
in this Compose file. Also fixed.
---
 elk/docker-compose.yml       | 6 +++---
 slides/containers/Logging.md | 8 ++++++--
 stacks/elk.yml               | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/elk/docker-compose.yml b/elk/docker-compose.yml
index b1e1e1a1..e77b97ac 100644
--- a/elk/docker-compose.yml
+++ b/elk/docker-compose.yml
@@ -2,14 +2,14 @@ version: "2"
 
 services:
   elasticsearch:
-    image: elasticsearch
+    image: elasticsearch:2
     # If you need to access ES directly, just uncomment those lines.
     #ports:
     #  - "9200:9200"
     #  - "9300:9300"
 
   logstash:
-    image: logstash
+    image: logstash:2
     command: |
       -e '
       input {
@@ -47,7 +47,7 @@ services:
       - "12201:12201/udp"
 
   kibana:
-    image: kibana
+    image: kibana:4
     ports:
       - "5601:5601"
     environment:
diff --git a/slides/containers/Logging.md b/slides/containers/Logging.md
index 0fa11d95..ecb24cb2 100644
--- a/slides/containers/Logging.md
+++ b/slides/containers/Logging.md
@@ -194,9 +194,13 @@ will have equal success with Fluent or other logging stacks!*
 
 - We are going to use a Compose file describing the ELK stack.
 
+- The Compose file is in the container.training repository on GitHub.
+
 ```bash
-$ cd ~/container.training/stacks
-$ docker-compose -f elk.yml up -d
+$ git clone https://github.com/jpetazzo/container.training
+$ cd container.training
+$ cd elk
+$ docker-compose up
 ```
 
 - Let's have a look at the Compose file while it's deploying.
diff --git a/stacks/elk.yml b/stacks/elk.yml
index d2460b39..ce1edab4 100644
--- a/stacks/elk.yml
+++ b/stacks/elk.yml
@@ -5,7 +5,7 @@ services:
     image: elasticsearch:2
 
   logstash:
-    image: logstash
+    image: logstash:2
     command: |
       -e '
       input {