Katacoda: Add external url & Updated docker images (thanos-io#1802)

* add external url Signed-off-by: Xiang Dai <[email protected]> * update thanos image tag Signed-off-by: Xiang Dai <[email protected]>
fatsheep9146 · Nov 28, 2019 · 6de3778 · 6de3778
1 parent 7b65bf5
commit 6de3778
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/tutorials/katacoda/thanos/1-globalview/courseBase.sh b/tutorials/katacoda/thanos/1-globalview/courseBase.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-docker pull quay.io/thanos/prometheus:v2.12.0-rc.0-rr-streaming
-docker pull quay.io/thanos/thanos:v0.7.0
+docker pull quay.io/prometheus/prometheus:v2.14.0
+docker pull quay.io/thanos/thanos:v0.9.0-rc.0
diff --git a/tutorials/katacoda/thanos/1-globalview/step1.md b/tutorials/katacoda/thanos/1-globalview/step1.md
@@ -95,10 +95,11 @@ docker run -d --net=host --rm \
     -v $(pwd)/prometheus0_eu1_data:/prometheus \
     -u root \
     --name prometheus-0-eu1 \
-    quay.io/thanos/prometheus:v2.12.0-rc.0-rr-streaming \
+    quay.io/prometheus/prometheus:v2.14.0 \
     --config.file=/etc/prometheus/prometheus.yml \
     --storage.tsdb.path=/prometheus \
     --web.listen-address=:9090 \
+    --web.external-url=https://[[HOST_SUBDOMAIN]]-9090-[[KATACODA_HOST]].environments.katacoda.com \
     --web.enable-lifecycle \
     --web.enable-admin-api && echo "Prometheus EU1 started!"
 ```{{execute}}
@@ -113,10 +114,11 @@ docker run -d --net=host --rm \
     -v $(pwd)/prometheus0_us1_data:/prometheus \
     -u root \
     --name prometheus-0-us1 \
-    quay.io/thanos/prometheus:v2.12.0-rc.0-rr-streaming \
+    quay.io/prometheus/prometheus:v2.14.0 \
     --config.file=/etc/prometheus/prometheus.yml \
     --storage.tsdb.path=/prometheus \
     --web.listen-address=:9091 \
+    --web.external-url=https://[[HOST_SUBDOMAIN]]-9091-[[KATACODA_HOST]].environments.katacoda.com \
     --web.enable-lifecycle \
     --web.enable-admin-api && echo "Prometheus 0 US1 started!"
 ```{{execute}}
@@ -129,10 +131,11 @@ docker run -d --net=host --rm \
     -v $(pwd)/prometheus1_us1_data:/prometheus \
     -u root \
     --name prometheus-1-us1 \
-    quay.io/thanos/prometheus:v2.12.0-rc.0-rr-streaming \
+    quay.io/prometheus/prometheus:v2.14.0 \
     --config.file=/etc/prometheus/prometheus.yml \
     --storage.tsdb.path=/prometheus \
     --web.listen-address=:9092 \
+    --web.external-url=https://[[HOST_SUBDOMAIN]]-9092-[[KATACODA_HOST]].environments.katacoda.com \
     --web.enable-lifecycle \
     --web.enable-admin-api && echo "Prometheus 1 US1 started!"
 ```{{execute}}

diff --git a/tutorials/katacoda/thanos/1-globalview/step2.md b/tutorials/katacoda/thanos/1-globalview/step2.md
@@ -10,7 +10,7 @@ component and can be invoked in a single command.
 Let's take a look at all the Thanos commands: 
 
 ```
-docker run --rm quay.io/thanos/thanos:v0.7.0 --help
+docker run --rm quay.io/thanos/thanos:v0.9.0-rc.0 --help
 ```{{execute}}
 
 You should see multiple commands that solves different purposes.
@@ -53,7 +53,7 @@ docker run -d --net=host --rm \
     -v $(pwd)/prometheus0_eu1.yml:/etc/prometheus/prometheus.yml \
     --name prometheus-0-sidecar-eu1 \
     -u root \
-    quay.io/thanos/thanos:v0.7.0 \
+    quay.io/thanos/thanos:v0.9.0-rc.0 \
     sidecar \
     --http-address 0.0.0.0:19090 \
     --grpc-address 0.0.0.0:19190 \
@@ -68,7 +68,7 @@ docker run -d --net=host --rm \
     -v $(pwd)/prometheus0_us1.yml:/etc/prometheus/prometheus.yml \
     --name prometheus-0-sidecar-us1 \
     -u root \
-    quay.io/thanos/thanos:v0.7.0 \
+    quay.io/thanos/thanos:v0.9.0-rc.0 \
     sidecar \
     --http-address 0.0.0.0:19091 \
     --grpc-address 0.0.0.0:19191 \
@@ -81,7 +81,7 @@ docker run -d --net=host --rm \
     -v $(pwd)/prometheus1_us1.yml:/etc/prometheus/prometheus.yml \
     --name prometheus-1-sidecar-us1 \
     -u root \
-    quay.io/thanos/thanos:v0.7.0 \
+    quay.io/thanos/thanos:v0.9.0-rc.0 \
     sidecar \
     --http-address 0.0.0.0:19092 \
     --grpc-address 0.0.0.0:19192 \

diff --git a/tutorials/katacoda/thanos/1-globalview/step3.md b/tutorials/katacoda/thanos/1-globalview/step3.md
@@ -28,7 +28,7 @@ Click below snippet to start the Querier.
 ```
 docker run -d --net=host --rm \
     --name querier \
-    quay.io/thanos/thanos:v0.7.0 \
+    quay.io/thanos/thanos:v0.9.0-rc.0 \
     query \
     --http-address 0.0.0.0:29090 \
     --query.replica-label replica \