Merge release 0.25 to main (#5210)

* Cut 0.25.0-rc.0 (#5184) Signed-off-by: Matej Gera <matejgera@gmail.com> * Cut v0.25.0 (#5209) Signed-off-by: Matej Gera <matejgera@gmail.com> * Create v0.25.1 built with Go 1.17.8 (#5226) The binaries published with this release are built with Go1.17.8 to avoid [CVE-2022-24921](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24921). Signed-off-by: Matthias Loibl <mail@matthiasloibl.com> * *: Cut 0.25.2 rc.0 (#5247) * fix: add null check to exemplar data (#5202) Signed-off-by: Thomas Mota <tmm@danskecommodities.com> * Ruler: Fix WAL directory in stateless mode (#5242) Signed-off-by: Matej Gera <matejgera@gmail.com> * Update CHANGELOG, VERSION Signed-off-by: Matej Gera <matejgera@gmail.com> * Updates busybox SHA (#5234) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: yeya24 <yeya24@users.noreply.github.com> Co-authored-by: Tomás Mota <tomasrebelomota@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: yeya24 <yeya24@users.noreply.github.com> * Cut v0.25.2 Signed-off-by: Matej Gera <matejgera@gmail.com> Update tutorials Signed-off-by: Matej Gera <matejgera@gmail.com> Co-authored-by: Matthias Loibl <mail@matthiasloibl.com> Co-authored-by: Tomás Mota <tomasrebelomota@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: yeya24 <yeya24@users.noreply.github.com>
thanos-io · Mar 28, 2022 · 2b87a36 · 2b87a36
1 parent f0e673a
commit 2b87a36
Show file tree

Hide file tree

Showing 19 changed files with 73 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,8 +12,6 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 
 ### Fixed
 
-- [#5242](https://github.com/thanos-io/thanos/pull/5242) Ruler: Make ruler use the correct WAL directory.
-
 ### Added
 
 - [#5220](https://github.com/thanos-io/thanos/pull/5220) Query Frontend: Add `--query-frontend.forward-header` flag, forward headers to downstream querier.
@@ -30,42 +28,63 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 
 ### Removed
 
-## [v0.25.0 - <in progress>](https://github.com/thanos-io/thanos/tree/release-0.25)
+## [v0.25.2](https://github.com/thanos-io/thanos/tree/release-0.25) - 2022.03.24
+
+### Fixed
+
+- [#5202](https://github.com/thanos-io/thanos/pull/5202) Exemplars: Return empty data instead of `nil` if no data available.
+- [#5242](https://github.com/thanos-io/thanos/pull/5242) Ruler: Make ruler use the correct WAL directory.
+
+## [v0.25.1](https://github.com/thanos-io/thanos/tree/release-0.25) - 2022.03.09
+
+The binaries published with this release are built with Go1.17.8 to avoid [CVE-2022-24921](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24921).
+
+### Fixed
+
+- [#5226](https://github.com/thanos-io/thanos/pull/5226) Rebuild Thanos for v0.25.1 with Go 1.17.8
+
+## [v0.25.0](https://github.com/thanos-io/thanos/tree/release-0.25) - 2022.02.23
 
 ### Added
 
 - [#5110](https://github.com/thanos-io/thanos/pull/5110) Block: Do not upload DebugMeta files to obj store.
 - [#4963](https://github.com/thanos-io/thanos/pull/4963) Compactor, Store, Tools: Loading block metadata now only filters out duplicates within a source (or compaction group if replica labels are configured), and does so in parallel over sources.
 - [#5089](https://github.com/thanos-io/thanos/pull/5089) S3: Create an empty map in the case SSE-KMS is used and no KMSEncryptionContext is passed.
-- [#4970](https://github.com/thanos-io/thanos/pull/4970) Added a new flag `exclude-delete` to `tools bucket ls`, which excludes blocks marked for deletion.
+- [#4970](https://github.com/thanos-io/thanos/pull/4970) Tools `tools bucket ls`: Added a new flag `exclude-delete` to exclude blocks marked for deletion.
 - [#4903](https://github.com/thanos-io/thanos/pull/4903) Compactor: Added tracing support for compaction.
-- [#4909](https://github.com/thanos-io/thanos/pull/4909) Compactor: Add flag --max-time / --min-time to filter blocks that are ready to be compacted.
+- [#4909](https://github.com/thanos-io/thanos/pull/4909) Compactor: Add flag --max-time / --min-time to filter blocks that are ready to be compacted.
 - [#4942](https://github.com/thanos-io/thanos/pull/4942) Tracing: add `traceid_128bit` support for jaeger.
 - [#4917](https://github.com/thanos-io/thanos/pull/4917) Query: add initial query pushdown for a subset of aggregations. Can be enabled with `--enable-feature=query-pushdown` on Thanos Query.
-- [#4888](https://github.com/thanos-io/thanos/pull/4888) Cache: support redis cache backend.
+- [#4888](https://github.com/thanos-io/thanos/pull/4888) Cache: Support redis cache backend.
 - [#4946](https://github.com/thanos-io/thanos/pull/4946) Store: Support tls_config configuration for the s3 minio client.
 - [#4974](https://github.com/thanos-io/thanos/pull/4974) Store: Support tls_config configuration for connecting with Azure storage.
 - [#4999](https://github.com/thanos-io/thanos/pull/4999) COS: Support `endpoint` configuration for vpc internal endpoint.
 - [#5059](https://github.com/thanos-io/thanos/pull/5059) Compactor: Adding minimum retention flag validation for downsampling retention.
-- [#4667](https://github.com/thanos-io/thanos/pull/4667) Add a pure aws-sdk auth for s3 storage.
-- [#5111](https://github.com/thanos-io/thanos/pull/5111) Add matcher support to Query Rules endpoint.
+- [#4667](https://github.com/thanos-io/thanos/pull/4667) S3: Add a pure AWS-SDK auth for S3 storage.
+- [#5111](https://github.com/thanos-io/thanos/pull/5111) Query: Add matcher support to Rules endpoint.
 - [#5117](https://github.com/thanos-io/thanos/pull/5117) Bucket replicate: Added flag `--ignore-marked-for-deletion` to avoid replication of blocks with the deletion mark.
 - [#5148](https://github.com/thanos-io/thanos/pull/5148) Receive: Add tenant tag for tracing spans.
+- [#4927](https://github.com/thanos-io/thanos/pull/4927) Rule: Added ability to specify multiple remote write targets.
+- [#4818](https://github.com/thanos-io/thanos/pull/4818) Store: Add Groupcache as a cache backend.
+
+### Changed
 
-## Changed
-- [#5144](https://github.com/thanos-io/thanos/pull/5144) UI: Improve graph color
+- [#5144](https://github.com/thanos-io/thanos/pull/5144) UI: Improve graph color.
 - [#5119](https://github.com/thanos-io/thanos/pull/5119) UI: Optimize Target, Alert and Service Discovery page and on each of them add a search bar.
+- [#4885](https://github.com/thanos-io/thanos/pull/4885) Store: Make `queryStats` log with human-readable format.
 
 ### Fixed
 
-- [#5102](https://github.com/thanos-io/thanos/pull/5102) Fix: Filter block rows in bucket UI according to searched block ID
-- [#5051](https://github.com/thanos-io/thanos/pull/5051) Prober: Remove spam of changing probe status.
+- [#5102](https://github.com/thanos-io/thanos/pull/5102) UI: Filter block rows in bucket UI according to searched block ID.
+- [#5051](https://github.com/thanos-io/thanos/pull/5051) Prober: Decrease 'changing probe status' log spamming.
 - [#4918](https://github.com/thanos-io/thanos/pull/4918) Tracing: Fixing force tracing with Jaeger.
 - [#4879](https://github.com/thanos-io/thanos/pull/4879) Bucket verify: Fixed bug causing wrong number of blocks to be checked.
 - [#4908](https://github.com/thanos-io/thanos/pull/4908) UI: Show 'minus' icon and add tooltip when store min / max time is not available.
 - [#4883](https://github.com/thanos-io/thanos/pull/4883) Mixin: adhere to RFC 1123 compatible component naming.
-- [#5114](https://github.com/thanos-io/thanos/pull/5114) Tools `thanos bucket inspect` fix time formatting.
-- [#5139](https://github.com/thanos-io/thanos/pull/5139) COS: Support multi-part upload, fix upload issue when index size more than 5GB.
+- [#5114](https://github.com/thanos-io/thanos/pull/5114) Tools `thanos bucket inspect`: Fix time formatting.
+- [#5139](https://github.com/thanos-io/thanos/pull/5139) COS: Support multi-part upload, fix upload issue when index size is larger than 5GB.
+- [#5014](https://github.com/thanos-io/thanos/pull/5014) Query: Set default times for `query_exemplars` API.
+- [#5103](https://github.com/thanos-io/thanos/pull/5013) Store: Fix race condition in filesystem client's `Delete()`.
 
 ## [v0.24.0](https://github.com/thanos-io/thanos/tree/release-0.24) - 2021.12.22
 
@@ -81,7 +100,6 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 - [#4710](https://github.com/thanos-io/thanos/pull/4710) Store: Add metric to capture timestamp of the last loaded block.
 - [#4736](https://github.com/thanos-io/thanos/pull/4736) S3: Add capability to use custom AWS STS Endpoint.
 - [#4764](https://github.com/thanos-io/thanos/pull/4764) Compactor: add `block-viewer.global.sync-block-timeout` flag to set the timeout of synchronization block metas.
-- [#4818](https://github.com/thanos-io/thanos/pull/4818) *EXPERIMENTAL* store: Add Groupcache as a cache backend. [Original issue](https://github.com/thanos-io/thanos/issues/2962).
 - [#4801](https://github.com/thanos-io/thanos/pull/4801) Compactor: added Prometheus metrics for tracking the progress of compaction and downsampling.
 - [#4444](https://github.com/thanos-io/thanos/pull/4444) UI: add mark deletion and no compaction to the Block UI.
 - [#4576](https://github.com/thanos-io/thanos/pull/4576) UI: add filter compaction level to the Block UI.

diff --git a/docs/release-process.md b/docs/release-process.md
@@ -23,7 +23,9 @@ Release shepherd responsibilities:
 
 | Release | Time of first RC     | Shepherd (GitHub handle)    |
 |---------|----------------------|-----------------------------|
-| v0.25.0 | (planned) 2022.02.22 | No one ATM                  |
+| v0.27.0 | (planned) 2022.05.16 | No one ATM                  |
+| v0.26.0 | (planned) 2022.04.11 | No one ATM                  |
+| v0.25.0 | 2022.03.01           | `@bwplotka` and `@matej-g`  |
 | v0.24.0 | 2021.12.22           | `@squat`                    |
 | v0.23.0 | 2021.09.02           | `@bwplotka`                 |
 | v0.22.0 | 2021.07.06           | `@GiedriusS`                |

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/prometheus/prometheus:v2.16.0
-docker pull quay.io/thanos/thanos:v0.24.0
+docker pull quay.io/thanos/thanos:v0.25.2
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.24.0 --help
+docker run --rm quay.io/thanos/thanos:v0.25.2 --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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     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 the snippet below to start the Querier.
 ```
 docker run -d --net=host --rm \
     --name querier \
-    quay.io/thanos/thanos:v0.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     query \
     --http-address 0.0.0.0:29090 \
     --query.replica-label replica \

diff --git a/tutorials/katacoda/thanos/2-lts/courseBase.sh b/tutorials/katacoda/thanos/2-lts/courseBase.sh
@@ -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.24.0
+docker pull quay.io/thanos/thanos:v0.25.2
 docker pull quay.io/thanos/thanosbench:v0.2.0-rc.1
 
 mkdir /root/editor
diff --git a/tutorials/katacoda/thanos/2-lts/step1.md b/tutorials/katacoda/thanos/2-lts/step1.md
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     sidecar \
     --http-address 0.0.0.0:19090 \
     --grpc-address 0.0.0.0:19190 \
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     query \
     --http-address 0.0.0.0:9091 \
     --query.replica-label replica \

diff --git a/tutorials/katacoda/thanos/2-lts/step2.md b/tutorials/katacoda/thanos/2-lts/step2.md
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     sidecar \
     --tsdb.path /prometheus \
     --objstore.config-file /etc/thanos/minio-bucket.yaml \

diff --git a/tutorials/katacoda/thanos/2-lts/step3.md b/tutorials/katacoda/thanos/2-lts/step3.md
@@ -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.24.0 --help```{{execute}}
+```docker run --rm quay.io/thanos/thanos:v0.25.2 --help```{{execute}}
 
 You should see multiple commands that solve different purposes, block storage based long-term storage for Prometheus.
 
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     store \
     --objstore.config-file /etc/thanos/minio-bucket.yaml \
     --http-address 0.0.0.0:19091 \
@@ -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.24.0 \
+   quay.io/thanos/thanos:v0.25.2 \
    query \
    --http-address 0.0.0.0:9091 \
    --query.replica-label replica \

diff --git a/tutorials/katacoda/thanos/2-lts/step4.md b/tutorials/katacoda/thanos/2-lts/step4.md
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     compact \
     --wait --wait-interval 30s \
     --consistency-delay 0s \

diff --git a/tutorials/katacoda/thanos/6-query-caching/courseBase.sh b/tutorials/katacoda/thanos/6-query-caching/courseBase.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 docker pull quay.io/prometheus/prometheus:v2.22.2
-docker pull quay.io/thanos/thanos:v0.24.0
+docker pull quay.io/thanos/thanos:v0.25.2
 docker pull yannrobert/docker-nginx
diff --git a/tutorials/katacoda/thanos/6-query-caching/step1.md b/tutorials/katacoda/thanos/6-query-caching/step1.md
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     sidecar \
     --http-address=0.0.0.0:1909"${i}" \
     --grpc-address=0.0.0.0:1919"${i}" \
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     query \
     --http-address 0.0.0.0:10912 \
     --grpc-address 0.0.0.0:10901 \

diff --git a/tutorials/katacoda/thanos/6-query-caching/step2.md b/tutorials/katacoda/thanos/6-query-caching/step2.md
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     query-frontend \
     --http-address 0.0.0.0:20902 \
     --query-frontend.compress-responses \

diff --git a/tutorials/katacoda/thanos/7-multi-tenancy/courseBase.sh b/tutorials/katacoda/thanos/7-multi-tenancy/courseBase.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 docker pull quay.io/prometheus/prometheus:v2.20.0
-docker pull quay.io/thanos/thanos:v0.24.0
+docker pull quay.io/thanos/thanos:v0.25.2
 docker pull quay.io/thanos/prom-label-proxy:v0.3.0-rc.0-ext1
 docker pull caddy:2.2.1
 

diff --git a/tutorials/katacoda/thanos/7-multi-tenancy/step1.md b/tutorials/katacoda/thanos/7-multi-tenancy/step1.md
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     sidecar \
     --http-address 0.0.0.0:19090 \
     --grpc-address 0.0.0.0:19190 \
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     sidecar \
     --http-address 0.0.0.0:19091 \
     --grpc-address 0.0.0.0:19191 \
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     sidecar \
     --http-address 0.0.0.0:19092 \
     --grpc-address 0.0.0.0:19192 \
@@ -170,7 +170,7 @@ Fruit:
 ```
 docker run -d --net=host --rm \
     --name querier-fruit \
-    quay.io/thanos/thanos:v0.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     query \
     --http-address 0.0.0.0:29091 \
     --grpc-address 0.0.0.0:29191 \
@@ -183,7 +183,7 @@ Veggie:
 ```
 docker run -d --net=host --rm \
     --name querier-veggie \
-    quay.io/thanos/thanos:v0.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     query \
     --http-address 0.0.0.0:29092 \
     --grpc-address 0.0.0.0:29192 \

diff --git a/tutorials/katacoda/thanos/7-multi-tenancy/step2.md b/tutorials/katacoda/thanos/7-multi-tenancy/step2.md
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     query \
     --http-address 0.0.0.0:29090 \
     --grpc-address 0.0.0.0:29190 \

diff --git a/tutorials/katacoda/thanos/x-playground/courseBase.sh b/tutorials/katacoda/thanos/x-playground/courseBase.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 docker pull quay.io/prometheus/prometheus:v2.20.0
-docker pull quay.io/thanos/thanos:v0.24.0
+docker pull quay.io/thanos/thanos:v0.25.2
 docker pull quay.io/thanos/thanosbench:v0.2.0-rc.1
 docker pull minio/minio:RELEASE.2019-01-31T00-31-19Z
 

diff --git a/tutorials/katacoda/thanos/x-playground/step1.md b/tutorials/katacoda/thanos/x-playground/step1.md
@@ -169,7 +169,7 @@ docker run -d --net=host --rm \
 ### Step1: Sidecar
 
 ```
-docker run -it --rm quay.io/thanos/thanos:v0.24.0 --help
+docker run -it --rm quay.io/thanos/thanos:v0.25.2 --help
 ```{{execute}}
 
 
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     sidecar \
     --http-address 0.0.0.0:19091 \
     --grpc-address 0.0.0.0:19191 \
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     sidecar \
     --http-address 0.0.0.0:19092 \
     --grpc-address 0.0.0.0:19192 \
@@ -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.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     sidecar \
     --http-address 0.0.0.0:19093 \
     --grpc-address 0.0.0.0:19193 \
@@ -223,7 +223,7 @@ docker run -d --net=host --rm \
 ```
 docker run -d --net=host --rm \
     --name querier \
-    quay.io/thanos/thanos:v0.24.0 \
+    quay.io/thanos/thanos:v0.25.2 \
     query \
     --http-address 0.0.0.0:9090 \
     --grpc-address 0.0.0.0:19190 \