Skip to content

Commit

Permalink
Merge release 0.21.1 (#4323)
Browse files Browse the repository at this point in the history
* Cut v0.21.0-rc.0

Signed-off-by: Prem Saraswat <[email protected]>

* Cut v0.21.0

Signed-off-by: Prem Saraswat <[email protected]>

* fix: sidecar: reloader: fix output config file permission (#4308)

Fixes: 4307

Signed-off-by: Kevin Hellemun <[email protected]>

* Fixed CHANGELOG for 0.21.1

Signed-off-by: Prem Saraswat <[email protected]>

* Cut release v0.21.1

Signed-off-by: Prem Saraswat <[email protected]>

* Revert version change

Signed-off-by: Prem Saraswat <[email protected]>

Co-authored-by: Kevin Hellemun <[email protected]>
  • Loading branch information
onprem and OGKevin authored Jun 10, 2021
1 parent e1f396a commit 766c29c
Show file tree
Hide file tree
Showing 17 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion tutorials/katacoda/thanos/1-globalview/courseBase.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash

docker pull quay.io/prometheus/prometheus:v2.16.0
docker pull quay.io/thanos/thanos:v0.20.0
docker pull quay.io/thanos/thanos:v0.21.1
8 changes: 4 additions & 4 deletions tutorials/katacoda/thanos/1-globalview/step2.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.20.0 --help
docker run --rm quay.io/thanos/thanos:v0.21.1 --help
```{{execute}}
You should see multiple commands that solves different purposes.
Expand Down Expand Up @@ -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.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--http-address 0.0.0.0:19090 \
--grpc-address 0.0.0.0:19190 \
Expand All @@ -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.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--http-address 0.0.0.0:19091 \
--grpc-address 0.0.0.0:19191 \
Expand All @@ -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.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--http-address 0.0.0.0:19092 \
--grpc-address 0.0.0.0:19192 \
Expand Down
2 changes: 1 addition & 1 deletion tutorials/katacoda/thanos/1-globalview/step3.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Click below snippet to start the Querier.
```
docker run -d --net=host --rm \
--name querier \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
query \
--http-address 0.0.0.0:29090 \
--query.replica-label replica \
Expand Down
2 changes: 1 addition & 1 deletion tutorials/katacoda/thanos/2-lts/courseBase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

docker pull minio/minio:RELEASE.2019-01-31T00-31-19Z
docker pull quay.io/prometheus/prometheus:v2.20.0
docker pull quay.io/thanos/thanos:v0.20.0
docker pull quay.io/thanos/thanos:v0.21.1
docker pull quay.io/thanos/thanosbench:v0.2.0-rc.1

mkdir /root/editor
4 changes: 2 additions & 2 deletions tutorials/katacoda/thanos/2-lts/step1.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Similar to previous course, let's setup global view querying with sidecar:
docker run -d --net=host --rm \
--name prometheus-0-eu1-sidecar \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--http-address 0.0.0.0:19090 \
--grpc-address 0.0.0.0:19190 \
Expand All @@ -130,7 +130,7 @@ so we will make sure we point the Querier to the gRPC endpoints of the sidecar:
```
docker run -d --net=host --rm \
--name querier \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
query \
--http-address 0.0.0.0:9091 \
--query.replica-label replica \
Expand Down
2 changes: 1 addition & 1 deletion tutorials/katacoda/thanos/2-lts/step2.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ docker run -d --net=host --rm \
-v /root/prom-eu1:/prometheus \
--name prometheus-0-eu1-sidecar \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--tsdb.path /prometheus \
--objstore.config-file /etc/thanos/minio-bucket.yaml \
Expand Down
6 changes: 3 additions & 3 deletions tutorials/katacoda/thanos/2-lts/step3.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ In this step, we will learn about Thanos Store Gateway and how to deploy it.

Let's take a look at all the Thanos commands:

```docker run --rm quay.io/thanos/thanos:v0.20.0 --help```{{execute}}
```docker run --rm quay.io/thanos/thanos:v0.21.1 --help```{{execute}}

You should see multiple commands that solve different purposes, block storage based long-term storage for Prometheus.

Expand All @@ -32,7 +32,7 @@ You can read more about [Store](https://thanos.io/tip/components/store.md/) here
docker run -d --net=host --rm \
-v /root/editor/bucket_storage.yaml:/etc/thanos/minio-bucket.yaml \
--name store-gateway \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
store \
--objstore.config-file /etc/thanos/minio-bucket.yaml \
--http-address 0.0.0.0:19091 \
Expand All @@ -49,7 +49,7 @@ Currently querier does not know about store yet. Let's change it by adding Store
docker stop querier && \
docker run -d --net=host --rm \
--name querier \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
query \
--http-address 0.0.0.0:9091 \
--query.replica-label replica \
Expand Down
2 changes: 1 addition & 1 deletion tutorials/katacoda/thanos/2-lts/step4.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Click below snippet to start the Compactor.
docker run -d --net=host --rm \
-v /root/editor/bucket_storage.yaml:/etc/thanos/minio-bucket.yaml \
--name thanos-compact \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
compact \
--wait --wait-interval 30s \
--consistency-delay 0s \
Expand Down
2 changes: 1 addition & 1 deletion tutorials/katacoda/thanos/6-query-caching/courseBase.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash

docker pull quay.io/prometheus/prometheus:v2.22.2
docker pull quay.io/thanos/thanos:v0.20.0
docker pull quay.io/thanos/thanos:v0.21.1
docker pull yannrobert/docker-nginx
4 changes: 2 additions & 2 deletions tutorials/katacoda/thanos/6-query-caching/step1.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ docker run -d --net=host --rm \
-v $(pwd)/prometheus"${i}".yml:/etc/prometheus/prometheus.yml \
--name prometheus-sidecar"${i}" \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--http-address=0.0.0.0:1909"${i}" \
--grpc-address=0.0.0.0:1919"${i}" \
Expand All @@ -129,7 +129,7 @@ And now, let's deploy Thanos Querier to have a global overview on our services.
```
docker run -d --net=host --rm \
--name querier \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
query \
--http-address 0.0.0.0:10912 \
--grpc-address 0.0.0.0:10901 \
Expand Down
2 changes: 1 addition & 1 deletion tutorials/katacoda/thanos/6-query-caching/step2.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ And deploy Query Frontend:
docker run -d --net=host --rm \
-v $(pwd)/frontend.yml:/etc/thanos/frontend.yml \
--name query-frontend \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
query-frontend \
--http-address 0.0.0.0:20902 \
--query-frontend.compress-responses \
Expand Down
2 changes: 1 addition & 1 deletion tutorials/katacoda/thanos/7-multi-tenancy/courseBase.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

docker pull quay.io/prometheus/prometheus:v2.20.0
docker pull quay.io/thanos/thanos:v0.20.0
docker pull quay.io/thanos/thanos:v0.21.1
docker pull quay.io/thanos/prom-label-proxy:v0.3.0-rc.0-ext1
docker pull caddy:2.2.1

Expand Down
10 changes: 5 additions & 5 deletions tutorials/katacoda/thanos/7-multi-tenancy/step1.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ docker run -d --net=host --rm \
-v $(pwd)/editor/prometheus0_fruit.yml:/etc/prometheus/prometheus.yml \
--name prometheus-0-sidecar-fruit \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--http-address 0.0.0.0:19090 \
--grpc-address 0.0.0.0:19190 \
Expand Down Expand Up @@ -120,7 +120,7 @@ docker run -d --net=host --rm \
-v $(pwd)/editor/prometheus0_veggie.yml:/etc/prometheus/prometheus.yml \
--name prometheus-0-sidecar-veggie \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--http-address 0.0.0.0:19091 \
--grpc-address 0.0.0.0:19191 \
Expand Down Expand Up @@ -152,7 +152,7 @@ docker run -d --net=host --rm \
-v $(pwd)/editor/prometheus1_veggie.yml:/etc/prometheus/prometheus.yml \
--name prometheus-01-sidecar-veggie \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--http-address 0.0.0.0:19092 \
--grpc-address 0.0.0.0:19192 \
Expand All @@ -170,7 +170,7 @@ Fruit:
```
docker run -d --net=host --rm \
--name querier-fruit \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
query \
--http-address 0.0.0.0:29091 \
--grpc-address 0.0.0.0:29191 \
Expand All @@ -183,7 +183,7 @@ Veggie:
```
docker run -d --net=host --rm \
--name querier-veggie \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
query \
--http-address 0.0.0.0:29092 \
--grpc-address 0.0.0.0:29192 \
Expand Down
2 changes: 1 addition & 1 deletion tutorials/katacoda/thanos/7-multi-tenancy/step2.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ docker stop querier-fruit && docker stop querier-veggie
```
docker run -d --net=host --rm \
--name querier-multi \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
query \
--http-address 0.0.0.0:29090 \
--grpc-address 0.0.0.0:29190 \
Expand Down
2 changes: 1 addition & 1 deletion tutorials/katacoda/thanos/x-playground/courseBase.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

docker pull quay.io/prometheus/prometheus:v2.20.0
docker pull quay.io/thanos/thanos:v0.20.0
docker pull quay.io/thanos/thanos:v0.21.1
docker pull quay.io/thanos/thanosbench:v0.2.0-rc.1
docker pull minio/minio:RELEASE.2019-01-31T00-31-19Z

Expand Down
10 changes: 5 additions & 5 deletions tutorials/katacoda/thanos/x-playground/step1.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ docker run -d --net=host --rm \
### Step1: Sidecar
```
docker run -it --rm quay.io/thanos/thanos:v0.20.0 --help
docker run -it --rm quay.io/thanos/thanos:v0.21.1 --help
```{{execute}}
Expand All @@ -180,7 +180,7 @@ docker run -d --net=host --rm \
-v ${CURR_DIR}/prom-eu1-replica0-config.yaml:/etc/prometheus/prometheus.yml \
--name prom-eu1-0-sidecar \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--http-address 0.0.0.0:19091 \
--grpc-address 0.0.0.0:19191 \
Expand All @@ -195,7 +195,7 @@ docker run -d --net=host --rm \
-v ${CURR_DIR}/prom-eu1-replica1-config.yaml:/etc/prometheus/prometheus.yml \
--name prom-eu1-1-sidecar \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--http-address 0.0.0.0:19092 \
--grpc-address 0.0.0.0:19192 \
Expand All @@ -210,7 +210,7 @@ docker run -d --net=host --rm \
-v ${CURR_DIR}/prom-us1-replica0-config.yaml:/etc/prometheus/prometheus.yml \
--name prom-us1-0-sidecar \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--http-address 0.0.0.0:19093 \
--grpc-address 0.0.0.0:19193 \
Expand All @@ -223,7 +223,7 @@ docker run -d --net=host --rm \
```
docker run -d --net=host --rm \
--name querier \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
query \
--http-address 0.0.0.0:9090 \
--grpc-address 0.0.0.0:19190 \
Expand Down
12 changes: 6 additions & 6 deletions tutorials/katacoda/thanos/x-playground/step2.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ docker run -d --net=host --rm \
-v ${CURR_DIR}/prom-eu1-replica0:/prometheus \
--name prom-eu1-0-sidecar \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--tsdb.path /prometheus \
--objstore.config-file /etc/thanos/minio-bucket.yaml \
Expand All @@ -85,7 +85,7 @@ docker run -d --net=host --rm \
-v ${CURR_DIR}/prom-eu1-replica1:/prometheus \
--name prom-eu1-1-sidecar \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--tsdb.path /prometheus \
--objstore.config-file /etc/thanos/minio-bucket.yaml \
Expand All @@ -105,7 +105,7 @@ docker run -d --net=host --rm \
-v ${CURR_DIR}/prom-us1-replica0:/prometheus \
--name prom-us1-0-sidecar \
-u root \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
sidecar \
--tsdb.path /prometheus \
--objstore.config-file /etc/thanos/minio-bucket.yaml \
Expand All @@ -130,7 +130,7 @@ Let's run Store Gateway server:
docker run -d --net=host --rm \
-v ${CURR_DIR}/minio-bucket.yaml:/etc/thanos/minio-bucket.yaml \
--name store-gateway \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
store \
--objstore.config-file /etc/thanos/minio-bucket.yaml \
--http-address 0.0.0.0:19094 \
Expand All @@ -143,7 +143,7 @@ docker run -d --net=host --rm \
docker stop querier && \
docker run -d --net=host --rm \
--name querier \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
query \
--http-address 0.0.0.0:9090 \
--grpc-address 0.0.0.0:19190 \
Expand All @@ -162,7 +162,7 @@ Visit https://[[HOST_SUBDOMAIN]]-9090-[[KATACODA_HOST]].environments.katacoda.co
docker run -d --net=host --rm \
-v ${CURR_DIR}/minio-bucket.yaml:/etc/thanos/minio-bucket.yaml \
--name compactor \
quay.io/thanos/thanos:v0.20.0 \
quay.io/thanos/thanos:v0.21.1 \
compact \
--wait --wait-interval 30s \
--consistency-delay 0s \
Expand Down

0 comments on commit 766c29c

Please sign in to comment.