Update thanos version to latest main (#5448)

* update thanos version to ca308b0d51a07987671804b4e06487f3b4173b51

Signed-off-by: Ben Ye <[email protected]>

* update metrics

Signed-off-by: Ben Ye <[email protected]>

* change log

Signed-off-by: Ben Ye <[email protected]>

* fix changelog

Signed-off-by: Ben Ye <[email protected]>

* pine lib version to prevent test failures

Signed-off-by: Ben Ye <[email protected]>

* try it

Signed-off-by: Ben Ye <[email protected]>

* use google.golang.org/protobuf

Signed-off-by: Ben Ye <[email protected]>

* fix test

Signed-off-by: Ben Ye <[email protected]>

* update go mod

Signed-off-by: Ben Ye <[email protected]>

* fix compactor tests

Signed-off-by: Ben Ye <[email protected]>

* lint

Signed-off-by: Ben Ye <[email protected]>

* fix test again

Signed-off-by: Ben Ye <[email protected]>

* update thanos version to include index header fix

Signed-off-by: Ben Ye <[email protected]>

* add another changelog entry

Signed-off-by: Ben Ye <[email protected]>

* update

Signed-off-by: Ben Ye <[email protected]>

* update docs

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>

Author: yeya24

CHANGELOG.md

@@ -12,6 +12,8 @@
 * [CHANGE] Alertmanager: Validating new fields on the PagerDuty AM config. #5290
 * [CHANGE] Ingester: Creating label `native-histogram-sample` on the `cortex_discarded_samples_total` to keep track of discarded native histogram samples. #5289
 * [CHANGE] Store Gateway: Rename `cortex_bucket_store_cached_postings_compression_time_seconds` to `cortex_bucket_store_cached_postings_compression_time_seconds_total`. #5431
+* [CHANGE] Store Gateway: Rename `cortex_bucket_store_cached_series_fetch_duration_seconds` to `cortex_bucket_store_series_fetch_duration_seconds` and `cortex_bucket_store_cached_postings_fetch_duration_seconds` to `cortex_bucket_store_postings_fetch_duration_seconds`. Add new metric `cortex_bucket_store_chunks_fetch_duration_seconds`. #5448
+* [CHANGE] Store Gateway: Remove `idle_timeout`, `max_conn_age`, `pool_size`, `min_idle_conns` fields for Redis index cache and caching bucket. #5448
 * [FEATURE] Store Gateway: Add `max_downloaded_bytes_per_request` to limit max bytes to download per store gateway request.
 * [FEATURE] Added 2 flags `-alertmanager.alertmanager-client.grpc-max-send-msg-size` and ` -alertmanager.alertmanager-client.grpc-max-recv-msg-size` to configure alert manager grpc client message size limits. #5338
 * [FEATURE] Query Frontend: Add `cortex_rejected_queries_total` metric for throttled queries. #5356

docs/blocks-storage/querier.md

@@ -601,15 +601,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.index-cache.redis.master-name
         [master_name: <string> | default = ""]
 
-        # Maximum number of socket connections.
-        # CLI flag: -blocks-storage.bucket-store.index-cache.redis.pool-size
-        [pool_size: <int> | default = 100]
-
-        # Specifies the minimum number of idle connections, which is useful when
-        # it is slow to establish new connections.
-        # CLI flag: -blocks-storage.bucket-store.index-cache.redis.min-idle-conns
-        [min_idle_conns: <int> | default = 10]
-
         # The maximum number of concurrent GetMulti() operations. If set to 0,
         # concurrency is unlimited.
         # CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-get-multi-concurrency
@@ -640,16 +631,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.index-cache.redis.write-timeout
         [write_timeout: <duration> | default = 3s]
 
-        # Amount of time after which client closes idle connections. Should be
-        # less than server's timeout. -1 disables idle timeout check.
-        # CLI flag: -blocks-storage.bucket-store.index-cache.redis.idle-timeout
-        [idle_timeout: <duration> | default = 5m]
-
-        # Connection age at which client retires (closes) the connection.
-        # Default 0 is to not close aged connections.
-        # CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-conn-age
-        [max_conn_age: <duration> | default = 0s]
-
         # Whether to enable tls for redis connection.
         # CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-enabled
         [tls_enabled: <boolean> | default = false]
@@ -760,15 +741,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.master-name
         [master_name: <string> | default = ""]
 
-        # Maximum number of socket connections.
-        # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.pool-size
-        [pool_size: <int> | default = 100]
-
-        # Specifies the minimum number of idle connections, which is useful when
-        # it is slow to establish new connections.
-        # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.min-idle-conns
-        [min_idle_conns: <int> | default = 10]
-
         # The maximum number of concurrent GetMulti() operations. If set to 0,
         # concurrency is unlimited.
         # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-get-multi-concurrency
@@ -799,16 +771,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.write-timeout
         [write_timeout: <duration> | default = 3s]
 
-        # Amount of time after which client closes idle connections. Should be
-        # less than server's timeout. -1 disables idle timeout check.
-        # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.idle-timeout
-        [idle_timeout: <duration> | default = 5m]
-
-        # Connection age at which client retires (closes) the connection.
-        # Default 0 is to not close aged connections.
-        # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-conn-age
-        [max_conn_age: <duration> | default = 0s]
-
         # Whether to enable tls for redis connection.
         # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-enabled
         [tls_enabled: <boolean> | default = false]
@@ -938,15 +900,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.master-name
         [master_name: <string> | default = ""]
 
-        # Maximum number of socket connections.
-        # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.pool-size
-        [pool_size: <int> | default = 100]
-
-        # Specifies the minimum number of idle connections, which is useful when
-        # it is slow to establish new connections.
-        # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.min-idle-conns
-        [min_idle_conns: <int> | default = 10]
-
         # The maximum number of concurrent GetMulti() operations. If set to 0,
         # concurrency is unlimited.
         # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-get-multi-concurrency
@@ -977,16 +930,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.write-timeout
         [write_timeout: <duration> | default = 3s]
 
-        # Amount of time after which client closes idle connections. Should be
-        # less than server's timeout. -1 disables idle timeout check.
-        # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.idle-timeout
-        [idle_timeout: <duration> | default = 5m]
-
-        # Connection age at which client retires (closes) the connection.
-        # Default 0 is to not close aged connections.
-        # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-conn-age
-        [max_conn_age: <duration> | default = 0s]
-
         # Whether to enable tls for redis connection.
         # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-enabled
         [tls_enabled: <boolean> | default = false]

docs/blocks-storage/store-gateway.md

@@ -688,15 +688,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.index-cache.redis.master-name
         [master_name: <string> | default = ""]
 
-        # Maximum number of socket connections.
-        # CLI flag: -blocks-storage.bucket-store.index-cache.redis.pool-size
-        [pool_size: <int> | default = 100]
-
-        # Specifies the minimum number of idle connections, which is useful when
-        # it is slow to establish new connections.
-        # CLI flag: -blocks-storage.bucket-store.index-cache.redis.min-idle-conns
-        [min_idle_conns: <int> | default = 10]
-
         # The maximum number of concurrent GetMulti() operations. If set to 0,
         # concurrency is unlimited.
         # CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-get-multi-concurrency
@@ -727,16 +718,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.index-cache.redis.write-timeout
         [write_timeout: <duration> | default = 3s]
 
-        # Amount of time after which client closes idle connections. Should be
-        # less than server's timeout. -1 disables idle timeout check.
-        # CLI flag: -blocks-storage.bucket-store.index-cache.redis.idle-timeout
-        [idle_timeout: <duration> | default = 5m]
-
-        # Connection age at which client retires (closes) the connection.
-        # Default 0 is to not close aged connections.
-        # CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-conn-age
-        [max_conn_age: <duration> | default = 0s]
-
         # Whether to enable tls for redis connection.
         # CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-enabled
         [tls_enabled: <boolean> | default = false]
@@ -847,15 +828,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.master-name
         [master_name: <string> | default = ""]
 
-        # Maximum number of socket connections.
-        # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.pool-size
-        [pool_size: <int> | default = 100]
-
-        # Specifies the minimum number of idle connections, which is useful when
-        # it is slow to establish new connections.
-        # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.min-idle-conns
-        [min_idle_conns: <int> | default = 10]
-
         # The maximum number of concurrent GetMulti() operations. If set to 0,
         # concurrency is unlimited.
         # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-get-multi-concurrency
@@ -886,16 +858,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.write-timeout
         [write_timeout: <duration> | default = 3s]
 
-        # Amount of time after which client closes idle connections. Should be
-        # less than server's timeout. -1 disables idle timeout check.
-        # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.idle-timeout
-        [idle_timeout: <duration> | default = 5m]
-
-        # Connection age at which client retires (closes) the connection.
-        # Default 0 is to not close aged connections.
-        # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-conn-age
-        [max_conn_age: <duration> | default = 0s]
-
         # Whether to enable tls for redis connection.
         # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-enabled
         [tls_enabled: <boolean> | default = false]
@@ -1025,15 +987,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.master-name
         [master_name: <string> | default = ""]
 
-        # Maximum number of socket connections.
-        # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.pool-size
-        [pool_size: <int> | default = 100]
-
-        # Specifies the minimum number of idle connections, which is useful when
-        # it is slow to establish new connections.
-        # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.min-idle-conns
-        [min_idle_conns: <int> | default = 10]
-
         # The maximum number of concurrent GetMulti() operations. If set to 0,
         # concurrency is unlimited.
         # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-get-multi-concurrency
@@ -1064,16 +1017,6 @@ blocks_storage:
         # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.write-timeout
         [write_timeout: <duration> | default = 3s]
 
-        # Amount of time after which client closes idle connections. Should be
-        # less than server's timeout. -1 disables idle timeout check.
-        # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.idle-timeout
-        [idle_timeout: <duration> | default = 5m]
-
-        # Connection age at which client retires (closes) the connection.
-        # Default 0 is to not close aged connections.
-        # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-conn-age
-        [max_conn_age: <duration> | default = 0s]
-
         # Whether to enable tls for redis connection.
         # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-enabled
         [tls_enabled: <boolean> | default = false]

docs/configuration/config-file-reference.md

@@ -1127,15 +1127,6 @@ bucket_store:
       # CLI flag: -blocks-storage.bucket-store.index-cache.redis.master-name
       [master_name: <string> | default = ""]
 
-      # Maximum number of socket connections.
-      # CLI flag: -blocks-storage.bucket-store.index-cache.redis.pool-size
-      [pool_size: <int> | default = 100]
-
-      # Specifies the minimum number of idle connections, which is useful when
-      # it is slow to establish new connections.
-      # CLI flag: -blocks-storage.bucket-store.index-cache.redis.min-idle-conns
-      [min_idle_conns: <int> | default = 10]
-
       # The maximum number of concurrent GetMulti() operations. If set to 0,
       # concurrency is unlimited.
       # CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-get-multi-concurrency
@@ -1166,16 +1157,6 @@ bucket_store:
       # CLI flag: -blocks-storage.bucket-store.index-cache.redis.write-timeout
       [write_timeout: <duration> | default = 3s]
 
-      # Amount of time after which client closes idle connections. Should be
-      # less than server's timeout. -1 disables idle timeout check.
-      # CLI flag: -blocks-storage.bucket-store.index-cache.redis.idle-timeout
-      [idle_timeout: <duration> | default = 5m]
-
-      # Connection age at which client retires (closes) the connection. Default
-      # 0 is to not close aged connections.
-      # CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-conn-age
-      [max_conn_age: <duration> | default = 0s]
-
       # Whether to enable tls for redis connection.
       # CLI flag: -blocks-storage.bucket-store.index-cache.redis.tls-enabled
       [tls_enabled: <boolean> | default = false]
@@ -1286,15 +1267,6 @@ bucket_store:
       # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.master-name
       [master_name: <string> | default = ""]
 
-      # Maximum number of socket connections.
-      # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.pool-size
-      [pool_size: <int> | default = 100]
-
-      # Specifies the minimum number of idle connections, which is useful when
-      # it is slow to establish new connections.
-      # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.min-idle-conns
-      [min_idle_conns: <int> | default = 10]
-
       # The maximum number of concurrent GetMulti() operations. If set to 0,
       # concurrency is unlimited.
       # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-get-multi-concurrency
@@ -1325,16 +1297,6 @@ bucket_store:
       # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.write-timeout
       [write_timeout: <duration> | default = 3s]
 
-      # Amount of time after which client closes idle connections. Should be
-      # less than server's timeout. -1 disables idle timeout check.
-      # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.idle-timeout
-      [idle_timeout: <duration> | default = 5m]
-
-      # Connection age at which client retires (closes) the connection. Default
-      # 0 is to not close aged connections.
-      # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-conn-age
-      [max_conn_age: <duration> | default = 0s]
-
       # Whether to enable tls for redis connection.
       # CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.tls-enabled
       [tls_enabled: <boolean> | default = false]
@@ -1463,15 +1425,6 @@ bucket_store:
       # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.master-name
       [master_name: <string> | default = ""]
 
-      # Maximum number of socket connections.
-      # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.pool-size
-      [pool_size: <int> | default = 100]
-
-      # Specifies the minimum number of idle connections, which is useful when
-      # it is slow to establish new connections.
-      # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.min-idle-conns
-      [min_idle_conns: <int> | default = 10]
-
       # The maximum number of concurrent GetMulti() operations. If set to 0,
       # concurrency is unlimited.
       # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-get-multi-concurrency
@@ -1502,16 +1455,6 @@ bucket_store:
       # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.write-timeout
       [write_timeout: <duration> | default = 3s]
 
-      # Amount of time after which client closes idle connections. Should be
-      # less than server's timeout. -1 disables idle timeout check.
-      # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.idle-timeout
-      [idle_timeout: <duration> | default = 5m]
-
-      # Connection age at which client retires (closes) the connection. Default
-      # 0 is to not close aged connections.
-      # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-conn-age
-      [max_conn_age: <duration> | default = 0s]
-
       # Whether to enable tls for redis connection.
       # CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.tls-enabled
       [tls_enabled: <boolean> | default = false]

go.mod

@@ -43,8 +43,8 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/alertmanager v0.25.1-0.20230505130626-263ca5c9438e
 	github.com/prometheus/client_golang v1.15.1
-	github.com/prometheus/client_model v0.3.0
-	github.com/prometheus/common v0.42.0
+	github.com/prometheus/client_model v0.4.0
+	github.com/prometheus/common v0.44.0
 	// Prometheus maps version 2.x.y to tags v0.x.y.
 	github.com/prometheus/prometheus v0.44.1-0.20230530154238-dfae954dc113
 	github.com/segmentio/fasthash v1.0.3
@@ -53,7 +53,7 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/thanos-io/objstore v0.0.0-20230629211010-ff1b35b9841a
 	github.com/thanos-io/promql-engine v0.0.0-20230526105742-791d78b260ea
-	github.com/thanos-io/thanos v0.31.1-0.20230627154113-7cfaf3fe2d43
+	github.com/thanos-io/thanos v0.31.1-0.20230711160112-df3a5f808726
 	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.8
@@ -79,6 +79,7 @@ require (
 require (
 	github.com/cespare/xxhash/v2 v2.2.0
 	github.com/google/go-cmp v0.5.9
+	google.golang.org/protobuf v1.30.0
 )
 
 require (
@@ -182,7 +183,7 @@ require (
 	github.com/prometheus/common/sigv4 v0.1.0 // indirect
 	github.com/prometheus/exporter-toolkit v0.10.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
-	github.com/redis/rueidis v1.0.2-go1.18 // indirect
+	github.com/redis/rueidis v1.0.10-go1.18 // indirect
 	github.com/rs/cors v1.9.0 // indirect
 	github.com/rs/xid v1.5.0 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
@@ -213,7 +214,7 @@ require (
 	golang.org/x/crypto v0.9.0 // indirect
 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
 	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/oauth2 v0.7.0 // indirect
+	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/tools v0.9.1 // indirect
@@ -224,7 +225,6 @@ require (
 	google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )