Update Thanos to fix issues with vertical sharding

Signed-off-by: Justin Jung <[email protected]>
cortexproject · Mar 20, 2023 · 9f6868f · 9f6868f
1 parent 04fc317
commit 9f6868f
Show file tree

Hide file tree

Showing 12 changed files with 118 additions and 76 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -50,6 +50,7 @@
 * [BUGFIX] Querier: Fix `/api/v1/series` returning 5XX instead of 4XX when limits are hit. #5169
 * [BUGFIX] Compactor: Fix issue that shuffle sharding planner return error if block is under visit by other compactor. #5188
 * [FEATURE] Alertmanager: Add support for time_intervals. #5102
+* [BUGFIX] Query Frontend: Disable `absent`, `absent_over_time` and `scalar` for vertical sharding. #5221
 
 ## 1.14.0 2022-12-02
 

diff --git a/go.mod b/go.mod
@@ -54,7 +54,7 @@ require (
 	github.com/stretchr/testify v1.8.2
 	github.com/thanos-community/promql-engine v0.0.0-20230224075812-ae04bbea7613
 	github.com/thanos-io/objstore v0.0.0-20230201072718-11ffbc490204
-	github.com/thanos-io/thanos v0.31.0-rc.1
+	github.com/thanos-io/thanos v0.29.1-0.20230314065129-06d9da40244f
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
 	github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d
 	go.etcd.io/etcd/api/v3 v3.5.7

diff --git a/go.sum b/go.sum
@@ -1513,8 +1513,8 @@ github.com/thanos-community/promql-engine v0.0.0-20230224075812-ae04bbea7613 h1:
 github.com/thanos-community/promql-engine v0.0.0-20230224075812-ae04bbea7613/go.mod h1:gREn4JarQ2DZdWirOtqZQd3p+c1xH+UVpGRjGKVoWx8=
 github.com/thanos-io/objstore v0.0.0-20230201072718-11ffbc490204 h1:W4w5Iph7j32Sf1QFWLJDCqvO0WgZS0jHGID+qnq3wV0=
 github.com/thanos-io/objstore v0.0.0-20230201072718-11ffbc490204/go.mod h1:STSgpY8M6EKF2G/raUFdbIMf2U9GgYlEjAEHJxjvpAo=
-github.com/thanos-io/thanos v0.31.0-rc.1 h1:0BXE8CTwx6/MSfOMEc0Lz8r35OkxQGZEgHDyxrdy+60=
-github.com/thanos-io/thanos v0.31.0-rc.1/go.mod h1:5ux+jb2oKr59+3XsCC0mX+JuAbPGJEMijjhcmnL/PMo=
+github.com/thanos-io/thanos v0.29.1-0.20230314065129-06d9da40244f h1:zp6JvrGDrUb6FNUXF++7EGg9JpETUY6GdLNuKRZbIK4=
+github.com/thanos-io/thanos v0.29.1-0.20230314065129-06d9da40244f/go.mod h1:AARtONvIIYyIm7w452siKssMT71kTAe4E3cORnLBj2g=
 github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab h1:7ZR3hmisBWw77ZpO1/o86g+JV3VKlk3d48jopJxzTjU=
 github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab/go.mod h1:eheTFp954zcWZXCU8d0AT76ftsQOTo4DTqkN/h3k1MY=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=

diff --git a/vendor/github.com/thanos-io/thanos/pkg/extkingpin/flags.go b/vendor/github.com/thanos-io/thanos/pkg/extkingpin/flags.go
diff --git a/vendor/github.com/thanos-io/thanos/pkg/extprom/http/instrument_server.go b/vendor/github.com/thanos-io/thanos/pkg/extprom/http/instrument_server.go
diff --git a/vendor/github.com/thanos-io/thanos/pkg/querysharding/analyzer.go b/vendor/github.com/thanos-io/thanos/pkg/querysharding/analyzer.go
diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/bucket.go b/vendor/github.com/thanos-io/thanos/pkg/store/bucket.go
diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/custom.go b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/custom.go
diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/storepb/prompb/samples.go b/vendor/github.com/thanos-io/thanos/pkg/store/storepb/prompb/samples.go
diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/tsdb.go b/vendor/github.com/thanos-io/thanos/pkg/store/tsdb.go
diff --git a/vendor/github.com/thanos-io/thanos/pkg/testutil/e2eutil/prometheus.go b/vendor/github.com/thanos-io/thanos/pkg/testutil/e2eutil/prometheus.go
diff --git a/vendor/modules.txt b/vendor/modules.txt