Skip to content

Commit efddde4

Browse files
authored
Upgraded Thanos to 0.11.0 and switched to binary index header (#2223)
* Upgraded Thanos to 0.11.0 and switched to binary index header Signed-off-by: Marco Pracucci <marco@pracucci.com>
1 parent 44b5ba9 commit efddde4

File tree

147 files changed

+4097
-946
lines changed

Some content is hidden

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

147 files changed

+4097
-946
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
* [CHANGE] Experimental TSDB: the querier in-memory index cache used by the experimental blocks storage shifted from per-tenant to per-querier. The `-experimental.tsdb.bucket-store.index-cache-size-bytes` now configures the per-querier index cache max size instead of a per-tenant cache and its default has been increased to 1GB. #2189
3838
* [CHANGE] If you are vendoring Cortex and use its components in your project, be aware that many Cortex components no longer start automatically when they are created. You may want to review PR and attached document. #2166
3939
* [CHANGE] Cortex now has /ready probe for all services, not just ingester and querier as before. In single-binary mode, /ready reports 204 only if all components are running properly. #2166
40+
* [CHANGE] Experimental TSDB: switched the blocks storage index header to the binary format. This change is expected to have no visible impact, except lower startup times and memory usage in the queriers. It's possible to switch back to the old JSON format via the flag `-experimental.tsdb.bucket-store.binary-index-header-enabled=false`. #2223
4041
* [FEATURE] Added a read-only local alertmanager config store using files named corresponding to their tenant id. #2125
4142
* [FEATURE] Added user sub rings to distribute users to a subset of ingesters. #1947
4243
* `--experimental.distributor.user-subring-size`

docs/configuration/config-file-reference.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2198,6 +2198,17 @@ bucket_store:
21982198
# CLI flag: -experimental.tsdb.bucket-store.meta-sync-concurrency
21992199
[meta_sync_concurrency: <int> | default = 20]
22002200
2201+
# Whether the bucket store should use the binary index header. If false, it
2202+
# uses the JSON index header.
2203+
# CLI flag: -experimental.tsdb.bucket-store.binary-index-header-enabled
2204+
[binary_index_header_enabled: <boolean> | default = true]
2205+
2206+
# Minimum age of a block before it's being read. Set it to safe value (e.g
2207+
# 30m) if your object storage is eventually consistent. GCS and S3 are
2208+
# (roughly) strongly consistent.
2209+
# CLI flag: -experimental.tsdb.bucket-store.consistency-delay
2210+
[consistency_delay: <duration> | default = 0s]
2211+
22012212
# How frequently does Cortex try to compact TSDB head. Block is only created if
22022213
# data covers smallest block range. Must be greater than 0 and max 5 minutes.
22032214
# CLI flag: -experimental.tsdb.head-compaction-interval

docs/operations/blocks-storage.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,17 @@ tsdb:
166166
# CLI flag: -experimental.tsdb.bucket-store.meta-sync-concurrency
167167
[meta_sync_concurrency: <int> | default = 20]
168168
169+
# Whether the bucket store should use the binary index header. If false, it
170+
# uses the JSON index header.
171+
# CLI flag: -experimental.tsdb.bucket-store.binary-index-header-enabled
172+
[binary_index_header_enabled: <boolean> | default = true]
173+
174+
# Minimum age of a block before it's being read. Set it to safe value (e.g
175+
# 30m) if your object storage is eventually consistent. GCS and S3 are
176+
# (roughly) strongly consistent.
177+
# CLI flag: -experimental.tsdb.bucket-store.consistency-delay
178+
[consistency_delay: <duration> | default = 0s]
179+
169180
# How frequently does Cortex try to compact TSDB head. Block is only created
170181
# if data covers smallest block range. Must be greater than 0 and max 5
171182
# minutes.

go.mod

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
2323
github.com/fsouza/fake-gcs-server v1.7.0
2424
github.com/go-kit/kit v0.9.0
25+
github.com/go-openapi/analysis v0.19.4 // indirect
2526
github.com/gocql/gocql v0.0.0-20200121121104-95d072f1b5bb
2627
github.com/gogo/protobuf v1.3.1
2728
github.com/gogo/status v1.0.3
@@ -41,13 +42,14 @@ require (
4142
github.com/lann/builder v0.0.0-20150808151131-f22ce00fd939 // indirect
4243
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
4344
github.com/lib/pq v1.3.0
45+
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect
4446
github.com/mitchellh/go-wordwrap v1.0.0
4547
github.com/oklog/ulid v1.3.1
4648
github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02
4749
github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9
4850
github.com/opentracing/opentracing-go v1.1.1-0.20200124165624-2876d2018785
4951
github.com/pkg/errors v0.8.1
50-
github.com/prometheus/alertmanager v0.19.0
52+
github.com/prometheus/alertmanager v0.20.0
5153
github.com/prometheus/client_golang v1.5.0
5254
github.com/prometheus/client_model v0.2.0
5355
github.com/prometheus/common v0.9.1
@@ -56,7 +58,7 @@ require (
5658
github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e
5759
github.com/spf13/afero v1.2.2
5860
github.com/stretchr/testify v1.4.0
59-
github.com/thanos-io/thanos v0.8.1-0.20200109203923-552ffa4c1a0d
61+
github.com/thanos-io/thanos v0.11.0
6062
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
6163
github.com/uber/jaeger-client-go v2.20.1+incompatible
6264
github.com/weaveworks/common v0.0.0-20200206153930-760e36ae819a
@@ -68,6 +70,7 @@ require (
6870
google.golang.org/api v0.14.0
6971
google.golang.org/grpc v1.25.1
7072
gopkg.in/yaml.v2 v2.2.7
73+
k8s.io/client-go v12.0.0+incompatible // indirect
7174
sigs.k8s.io/yaml v1.1.0
7275
)
7376

0 commit comments

Comments
 (0)