From 1d5f4330c06bf42a528596f29f4a3b76d73537bc 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 11:10:39 -0700
Subject: [PATCH] Improve autotest; fix prometheus node collector

---
 autotest/autotest.py  | 2 +-
 docs/metrics.md       | 6 +++---
 stacks/prometheus.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/autotest/autotest.py b/autotest/autotest.py
index b43cc693..27001237 100755
--- a/autotest/autotest.py
+++ b/autotest/autotest.py
@@ -164,7 +164,7 @@ while i < len(actions):
     print(slide.content.replace(snippet.content, ansi(7)(snippet.content)))
     print(hrule())
     if interactive:
-        print("[{}] Shall we execute that snippet above?".format(i))
+        print("[{}/{}] Shall we execute that snippet above?".format(i, len(actions)))
         print("(ENTER to execute, 'c' to continue until next error, N to jump to step #N)")
         command = raw_input("> ")
     else:
diff --git a/docs/metrics.md b/docs/metrics.md
index 071fbdeb..e0232d71 100644
--- a/docs/metrics.md
+++ b/docs/metrics.md
@@ -1006,9 +1006,9 @@ class: prom-manual
      --mount type=bind,source=/sys,target=/host/sys \
      --mount type=bind,source=/,target=/rootfs \
      prom/node-exporter \
-      -collector.procfs /host/proc \
-      -collector.sysfs /host/proc \
-      -collector.filesystem.ignored-mount-points "^/(sys|proc|dev|host|etc)($|/)"
+      --path.procfs /host/proc \
+      --path.sysfs /host/proc \
+      --collector.filesystem.ignored-mount-points "^/(sys|proc|dev|host|etc)($|/)"
    ```
 
 ]
diff --git a/stacks/prometheus.yml b/stacks/prometheus.yml
index 3bc2e08d..c0dc8922 100644
--- a/stacks/prometheus.yml
+++ b/stacks/prometheus.yml
@@ -10,7 +10,7 @@ services:
 
   node:
     image: prom/node-exporter
-    command: -collector.procfs /host/proc -collector.sysfs /host/proc -collector.filesystem.ignored-mount-points "^(sys|proc|dev|host|etc)($$|/)"
+    command: --path.procfs /host/proc --path.sysfs /host/proc --collector.filesystem.ignored-mount-points "^(sys|proc|dev|host|etc)($$|/)"
     deploy:
       mode: global
     volumes: