From 9e5bab1a76339b01eb2f2388616d5becd75aee20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= <jerome.petazzoni@gmail.com>
Date: Tue, 31 Oct 2017 09:37:49 -0700
Subject: [PATCH] tweaks for automated testing

---
 docs/logging.md | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/docs/logging.md b/docs/logging.md
index 48b7215d..0748b853 100644
--- a/docs/logging.md
+++ b/docs/logging.md
@@ -152,15 +152,13 @@ class: elk-manual
 
 .exercise[
 
-- Get the ID of the Logstash container:
+- View the logs of the logstash service:
   ```bash
-  CID=$(docker ps -q --filter label=com.docker.swarm.service.name=logstash)
+  docker service logs logstash --follow
   ```
 
-- View the logs:
-  ```bash
-  docker logs --follow $CID
-  ```
+  <!-- ```wait "message" => "ok"``` -->
+  <!-- ```keys ^C``` -->
 
 ]
 
@@ -267,6 +265,9 @@ The test message should show up in the logstash container logs.
            alpine echo hello
   ```
 
+  <!-- ```wait Detected task failure``` -->
+  <!-- ```keys ^C``` -->
+
 ]
 
 The test message should show up as well in the logstash container logs.
@@ -345,18 +346,6 @@ You can also set `--restart-delay`, `--restart-max-attempts`, and `--restart-win
 
 .exercise[
 
-<!--
-
-- Enable GELF logging for all our *stateless* services:
-  ```bash
-    for SERVICE in hasher rng webui worker; do
-      docker service update dockercoins_$SERVICE \
-             --log-driver gelf --log-opt gelf-address=udp://127.0.0.1:12201
-    done
-  ```
-
--->
-
 - Enable GELF logging for the `rng` service:
   ```bash
     docker service update dockercoins_rng \