Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Thanos to master #2634

Merged
merged 9 commits into from
May 27, 2020
Merged

Conversation

codesome
Copy link
Contributor

@codesome codesome commented May 26, 2020

What this PR does:

Upgrades Thanos to master which has upgraded Prometheus

Some dependencies are giving errors and I am on it

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@codesome codesome force-pushed the thanos-master branch 3 times, most recently from 95adb5f to 5ab3b8e Compare May 27, 2020 07:20
@codesome codesome marked this pull request as ready for review May 27, 2020 07:27
Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, exciting! SeriesLifecycleCallback 🎉

CHANGELOG.md Outdated Show resolved Hide resolved
@pracucci
Copy link
Contributor

A part from Prometheus changes, I've checked:

  • Thanos upgrade: checked diff, LGTM
  • github.com/aws/aws-sdk-go v1.29.18 to v1.30.12: checked the CHANGELOG and LGTM, but in v1.30.16 they fixed a bug "Fix S3 client behavior wrt 200 OK response with empty payload" which could be safer if we get in
  • github.com/hashicorp/memberlist v0.1.5 to v0.2.0: no changelog available, checked the diff, done some changes in the transport :fingercrossed:
  • github.com/prometheus/client_golang v1.5.1 to v1.6.0: checked the CHANGELOG and LGTM
  • github.com/golang/protobuf v1.3.3 to v1.4.0: long release notes for 1.4.0, but no breaking changes affecting this release.
  • github.com/armon/go-metrics v0.3.0 to v0.3.3: according to the diff, minor changes
  • cloud.google.com/go/storage v1.3.0 to v1.6.0: checked the release notes and LGTM
  • cloud.google.com/go/bigtable v1.1.0 to v1.2.0: checked the release notes and LGTM

@@ -255,16 +256,17 @@ func (a *API) RegisterQuerier(queryable storage.Queryable, engine *promql.Engine
api := v1.NewAPI(
engine,
queryable,
querier.DummyTargetRetriever{},
querier.DummyAlertmanagerRetriever{},
func(context.Context) v1.TargetRetriever { return &querier.DummyTargetRetriever{} },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gotjosh Once this PR is merged, you should be able to work on your metadata API refactoring.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the head's up, pretty excited to see this. We'll also be able to remove all the copy/paste for the alerts/rules API 😄

pkg/api/api.go Outdated Show resolved Hide resolved
Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
@pracucci pracucci merged commit 8cfa79c into cortexproject:master May 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants