Skip to content

Commit 963deb1

Browse files
authored
update thanos version to latest commit eb80318dee84ce8e21e42e662f6e2fd9dc02b69f (#5495)
Signed-off-by: Ben Ye <[email protected]>
1 parent 31065a7 commit 963deb1

File tree

145 files changed

+24275
-5199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+24275
-5199
lines changed

docs/blocks-storage/querier.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,14 @@ blocks_storage:
620620
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.set-multi-batch-size
621621
[set_multi_batch_size: <int> | default = 100]
622622
623+
# The maximum number of concurrent asynchronous operations can occur.
624+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-async-concurrency
625+
[max_async_concurrency: <int> | default = 50]
626+
627+
# The maximum number of enqueued asynchronous operations allowed.
628+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-async-buffer-size
629+
[max_async_buffer_size: <int> | default = 10000]
630+
623631
# Client dial timeout.
624632
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.dial-timeout
625633
[dial_timeout: <duration> | default = 5s]
@@ -760,6 +768,14 @@ blocks_storage:
760768
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.set-multi-batch-size
761769
[set_multi_batch_size: <int> | default = 100]
762770
771+
# The maximum number of concurrent asynchronous operations can occur.
772+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-async-concurrency
773+
[max_async_concurrency: <int> | default = 50]
774+
775+
# The maximum number of enqueued asynchronous operations allowed.
776+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-async-buffer-size
777+
[max_async_buffer_size: <int> | default = 10000]
778+
763779
# Client dial timeout.
764780
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.dial-timeout
765781
[dial_timeout: <duration> | default = 5s]
@@ -919,6 +935,14 @@ blocks_storage:
919935
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.set-multi-batch-size
920936
[set_multi_batch_size: <int> | default = 100]
921937
938+
# The maximum number of concurrent asynchronous operations can occur.
939+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-async-concurrency
940+
[max_async_concurrency: <int> | default = 50]
941+
942+
# The maximum number of enqueued asynchronous operations allowed.
943+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-async-buffer-size
944+
[max_async_buffer_size: <int> | default = 10000]
945+
922946
# Client dial timeout.
923947
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.dial-timeout
924948
[dial_timeout: <duration> | default = 5s]

docs/blocks-storage/store-gateway.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,14 @@ blocks_storage:
707707
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.set-multi-batch-size
708708
[set_multi_batch_size: <int> | default = 100]
709709
710+
# The maximum number of concurrent asynchronous operations can occur.
711+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-async-concurrency
712+
[max_async_concurrency: <int> | default = 50]
713+
714+
# The maximum number of enqueued asynchronous operations allowed.
715+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-async-buffer-size
716+
[max_async_buffer_size: <int> | default = 10000]
717+
710718
# Client dial timeout.
711719
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.dial-timeout
712720
[dial_timeout: <duration> | default = 5s]
@@ -847,6 +855,14 @@ blocks_storage:
847855
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.set-multi-batch-size
848856
[set_multi_batch_size: <int> | default = 100]
849857
858+
# The maximum number of concurrent asynchronous operations can occur.
859+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-async-concurrency
860+
[max_async_concurrency: <int> | default = 50]
861+
862+
# The maximum number of enqueued asynchronous operations allowed.
863+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-async-buffer-size
864+
[max_async_buffer_size: <int> | default = 10000]
865+
850866
# Client dial timeout.
851867
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.dial-timeout
852868
[dial_timeout: <duration> | default = 5s]
@@ -1006,6 +1022,14 @@ blocks_storage:
10061022
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.set-multi-batch-size
10071023
[set_multi_batch_size: <int> | default = 100]
10081024
1025+
# The maximum number of concurrent asynchronous operations can occur.
1026+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-async-concurrency
1027+
[max_async_concurrency: <int> | default = 50]
1028+
1029+
# The maximum number of enqueued asynchronous operations allowed.
1030+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-async-buffer-size
1031+
[max_async_buffer_size: <int> | default = 10000]
1032+
10091033
# Client dial timeout.
10101034
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.dial-timeout
10111035
[dial_timeout: <duration> | default = 5s]

docs/configuration/config-file-reference.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,6 +1146,14 @@ bucket_store:
11461146
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.set-multi-batch-size
11471147
[set_multi_batch_size: <int> | default = 100]
11481148
1149+
# The maximum number of concurrent asynchronous operations can occur.
1150+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-async-concurrency
1151+
[max_async_concurrency: <int> | default = 50]
1152+
1153+
# The maximum number of enqueued asynchronous operations allowed.
1154+
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.max-async-buffer-size
1155+
[max_async_buffer_size: <int> | default = 10000]
1156+
11491157
# Client dial timeout.
11501158
# CLI flag: -blocks-storage.bucket-store.index-cache.redis.dial-timeout
11511159
[dial_timeout: <duration> | default = 5s]
@@ -1286,6 +1294,14 @@ bucket_store:
12861294
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.set-multi-batch-size
12871295
[set_multi_batch_size: <int> | default = 100]
12881296
1297+
# The maximum number of concurrent asynchronous operations can occur.
1298+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-async-concurrency
1299+
[max_async_concurrency: <int> | default = 50]
1300+
1301+
# The maximum number of enqueued asynchronous operations allowed.
1302+
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.max-async-buffer-size
1303+
[max_async_buffer_size: <int> | default = 10000]
1304+
12891305
# Client dial timeout.
12901306
# CLI flag: -blocks-storage.bucket-store.chunks-cache.redis.dial-timeout
12911307
[dial_timeout: <duration> | default = 5s]
@@ -1444,6 +1460,14 @@ bucket_store:
14441460
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.set-multi-batch-size
14451461
[set_multi_batch_size: <int> | default = 100]
14461462
1463+
# The maximum number of concurrent asynchronous operations can occur.
1464+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-async-concurrency
1465+
[max_async_concurrency: <int> | default = 50]
1466+
1467+
# The maximum number of enqueued asynchronous operations allowed.
1468+
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.max-async-buffer-size
1469+
[max_async_buffer_size: <int> | default = 10000]
1470+
14471471
# Client dial timeout.
14481472
# CLI flag: -blocks-storage.bucket-store.metadata-cache.redis.dial-timeout
14491473
[dial_timeout: <duration> | default = 5s]

go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ require (
3232
github.com/hashicorp/go-sockaddr v1.0.2
3333
github.com/hashicorp/memberlist v0.5.0
3434
github.com/json-iterator/go v1.1.12
35-
github.com/klauspost/compress v1.16.5
35+
github.com/klauspost/compress v1.16.7
3636
github.com/lib/pq v1.10.9
37-
github.com/minio/minio-go/v7 v7.0.57-0.20230614143930-1d018af3bfab
37+
github.com/minio/minio-go/v7 v7.0.61
3838
github.com/mitchellh/go-wordwrap v1.0.1
3939
github.com/oklog/ulid v1.3.1
4040
github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e
@@ -51,9 +51,9 @@ require (
5151
github.com/sony/gobreaker v0.5.0
5252
github.com/spf13/afero v1.9.5
5353
github.com/stretchr/testify v1.8.4
54-
github.com/thanos-io/objstore v0.0.0-20230713070940-eb01c83b89a4
54+
github.com/thanos-io/objstore v0.0.0-20230721074820-89475d4508df
5555
github.com/thanos-io/promql-engine v0.0.0-20230526105742-791d78b260ea
56-
github.com/thanos-io/thanos v0.31.1-0.20230717161853-6fda58a6291f
56+
github.com/thanos-io/thanos v0.31.1-0.20230802165700-eb80318dee84
5757
github.com/uber/jaeger-client-go v2.30.0+incompatible
5858
github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d
5959
go.etcd.io/etcd/api/v3 v3.5.8
@@ -67,7 +67,7 @@ require (
6767
go.opentelemetry.io/otel/sdk v1.16.0
6868
go.opentelemetry.io/otel/trace v1.16.0
6969
go.uber.org/atomic v1.11.0
70-
golang.org/x/net v0.10.0
70+
golang.org/x/net v0.12.0
7171
golang.org/x/sync v0.2.0
7272
golang.org/x/time v0.3.0
7373
google.golang.org/grpc v1.55.0
@@ -160,7 +160,7 @@ require (
160160
github.com/josharian/intern v1.0.0 // indirect
161161
github.com/jpillora/backoff v1.0.0 // indirect
162162
github.com/julienschmidt/httprouter v1.3.0 // indirect
163-
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
163+
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
164164
github.com/kylelemons/godebug v1.1.0 // indirect
165165
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
166166
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -190,7 +190,7 @@ require (
190190
github.com/sercand/kuberesolver v2.4.0+incompatible // indirect
191191
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
192192
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
193-
github.com/sirupsen/logrus v1.9.2 // indirect
193+
github.com/sirupsen/logrus v1.9.3 // indirect
194194
github.com/stretchr/objx v0.5.0 // indirect
195195
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
196196
github.com/vimeo/galaxycache v0.0.0-20210323154928-b7e5d71c067a // indirect
@@ -211,12 +211,12 @@ require (
211211
go.uber.org/zap v1.21.0 // indirect
212212
go4.org/intern v0.0.0-20230205224052-192e9f60865c // indirect
213213
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230221090011-e4bae7ad2296 // indirect
214-
golang.org/x/crypto v0.9.0 // indirect
214+
golang.org/x/crypto v0.11.0 // indirect
215215
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
216216
golang.org/x/mod v0.10.0 // indirect
217217
golang.org/x/oauth2 v0.8.0 // indirect
218-
golang.org/x/sys v0.8.0 // indirect
219-
golang.org/x/text v0.9.0 // indirect
218+
golang.org/x/sys v0.10.0 // indirect
219+
golang.org/x/text v0.11.0 // indirect
220220
golang.org/x/tools v0.9.1 // indirect
221221
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
222222
gonum.org/v1/gonum v0.12.0 // indirect

0 commit comments

Comments
 (0)