Skip to content

Commit 5384a44

Browse files
pracuccigouthamve
authored andcommitted
Updated Thanos to 0.8.1 (#1841)
Signed-off-by: Marco Pracucci <[email protected]>
1 parent 63731d7 commit 5384a44

File tree

244 files changed

+64472
-41579
lines changed

Some content is hidden

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

244 files changed

+64472
-41579
lines changed

go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
github.com/gorilla/context v1.1.1 // indirect
3636
github.com/gorilla/mux v1.6.2
3737
github.com/gorilla/websocket v1.4.0 // indirect
38-
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4
38+
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
3939
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
4040
github.com/hashicorp/consul/api v1.1.0
4141
github.com/hashicorp/go-cleanhttp v0.5.1
@@ -65,7 +65,7 @@ require (
6565
github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e
6666
github.com/sercand/kuberesolver v2.1.0+incompatible // indirect
6767
github.com/stretchr/testify v1.4.0
68-
github.com/thanos-io/thanos v0.7.0
68+
github.com/thanos-io/thanos v0.8.1
6969
github.com/tinylib/msgp v0.0.0-20161221055906-38a6f61a768d // indirect
7070
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
7171
github.com/uber/jaeger-client-go v2.20.0+incompatible
@@ -74,10 +74,9 @@ require (
7474
github.com/weaveworks/promrus v1.2.0 // indirect
7575
go.etcd.io/bbolt v1.3.3
7676
go.etcd.io/etcd v0.0.0-20190709142735-eb7dd97135a5
77-
go.uber.org/zap v1.10.0 // indirect
78-
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
77+
golang.org/x/net v0.0.0-20190923162816-aa69164e4478
7978
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
80-
google.golang.org/api v0.8.0
79+
google.golang.org/api v0.11.0
8180
google.golang.org/grpc v1.25.1
8281
gopkg.in/yaml.v2 v2.2.2
8382
)

go.sum

Lines changed: 39 additions & 7 deletions
Large diffs are not rendered by default.

pkg/querier/block_store.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ func (u *UserStore) syncUserStores(ctx context.Context, f func(context.Context,
123123
if err != nil {
124124
return err
125125
}
126-
bs, err = store.NewBucketStore(u.logger,
126+
bs, err = store.NewBucketStore(
127+
u.logger,
127128
nil,
128129
userBkt,
129130
filepath.Join(u.cfg.SyncDir, user),
@@ -137,6 +138,8 @@ func (u *UserStore) syncUserStores(ctx context.Context, f func(context.Context,
137138
MinTime: *mint,
138139
MaxTime: *maxt,
139140
},
141+
nil, // No relabelling config
142+
false, // No need to enable backward compatibility with Thanos pre 0.8.0 queriers
140143
)
141144
if err != nil {
142145
return err

vendor/github.com/grpc-ecosystem/go-grpc-middleware/.gitignore

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

vendor/github.com/grpc-ecosystem/go-grpc-middleware/.travis.yml

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

vendor/github.com/grpc-ecosystem/go-grpc-middleware/CHANGELOG.md

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

vendor/github.com/grpc-ecosystem/go-grpc-middleware/Gopkg.lock

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

vendor/github.com/grpc-ecosystem/go-grpc-middleware/Gopkg.toml

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

vendor/github.com/grpc-ecosystem/go-grpc-middleware/README.md

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

0 commit comments

Comments
 (0)