Skip to content

Commit cc7154b

Browse files
siggyalvinlin123
authored andcommitted
Update Thanos to latest main (cortexproject#4585)
* Update Thanos to latest main Update Thanos dependency to include thanos-io/thanos#4928, to conserve memory. Signed-off-by: Andrew Seigner <[email protected]> * Update changelog to summarize user-facing changes Signed-off-by: Andrew Seigner <[email protected]> Signed-off-by: Alvin Lin <[email protected]>
1 parent 93b6d29 commit cc7154b

Some content is hidden

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

54 files changed

+807
-320
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* [ENHANCEMENT] Blocks storage: Add `-blocks-storage.azure.http.*`, `-alertmanager-storage.azure.http.*`, and `-ruler-storage.azure.http.*` to configure the Azure storage client. #4581
2222
* [BUGFIX] AlertManager: remove stale template files. #4495
2323
* [BUGFIX] Distributor: fix bug in query-exemplar where some results would get dropped. #4582
24+
* [BUGFIX] Update Thanos dependency: compactor tracing support, azure blocks storage memory fix. #4585
2425

2526
## 1.11.0 2021-11-25
2627

go.mod

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ require (
1818
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
1919
github.com/felixge/fgprof v0.9.1
2020
github.com/fsouza/fake-gcs-server v1.7.0
21-
github.com/go-kit/kit v0.12.0 // indirect
2221
github.com/go-kit/log v0.2.0
2322
github.com/go-openapi/strfmt v0.21.0
2423
github.com/go-openapi/swag v0.19.15
@@ -32,8 +31,6 @@ require (
3231
github.com/gorilla/mux v1.8.0
3332
github.com/grafana/dskit v0.0.0-20211021180445-3bd016e9d7f1
3433
github.com/json-iterator/go v1.1.12
35-
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
36-
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
3734
github.com/lib/pq v1.3.0
3835
github.com/minio/minio-go/v7 v7.0.10
3936
github.com/mitchellh/go-wordwrap v1.0.0
@@ -86,8 +83,8 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.38.0
8683
// We only pin this version to avoid problems with running go get: github.com/thanos-io/thanos@main. That
8784
// currently fails because Thanos isn't merging release branches to main branch, and Go modules system is then
8885
// confused about which version is the latest one. v0.22.0 was released in July, but latest tag reachable from main
89-
// is v0.19.1. We pin version from late september here. Feel free to remove when updating to later version.
90-
replace github.com/thanos-io/thanos v0.22.0 => github.com/thanos-io/thanos v0.19.1-0.20211122085937-de0e3848ff60
86+
// is v0.19.1. We pin version from early December here. Feel free to remove when updating to later version.
87+
replace github.com/thanos-io/thanos v0.22.0 => github.com/thanos-io/thanos v0.19.1-0.20211208205607-d1acaea2a11a
9188

9289
// Pin aws-sdk to version prior to go-kit update, to reduce the bulk of change.
9390
// Un-pin once Cortex 1.11 is released.

go.sum

Lines changed: 4 additions & 94 deletions
Large diffs are not rendered by default.

vendor/github.com/google/btree/btree.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/btree/go.mod

Lines changed: 0 additions & 17 deletions
This file was deleted.

vendor/github.com/thanos-io/thanos/pkg/block/block.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/block/fetcher.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/block/index.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/block/indexheader/binary_reader.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/block/indexheader/lazy_binary_reader.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/block/indexheader/reader_pool.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/block/metadata/hash.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/block/metadata/markers.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/block/metadata/meta.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/block/writer.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/cache/inmemory.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/cache/memcached.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/cache/redis.go

Lines changed: 69 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/cacheutil/memcached_client.go

Lines changed: 17 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)