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

Update Thanos to v0.19.1-0.20210923155558-c15594a03c45. #4505

Merged
merged 3 commits into from Oct 1, 2021

Conversation

pstibrany
Copy link
Contributor

@pstibrany pstibrany commented Oct 1, 2021

What this PR does: This PR updates Thanos to v0.19.1-0.20210923155558-c15594a03c45.

This PR does not integrate new Thanos' compactor feature for skipping blocks with out of order chunks.

This PR also updates Prometheus, but doesn't integrate new snapshot on shutdown feature yet.

Checklist

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

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
…using lint check.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
@pstibrany pstibrany enabled auto-merge (squash) October 1, 2021 08:49
@pstibrany pstibrany merged commit 9e8b48b into cortexproject:master Oct 1, 2021
@pstibrany pstibrany mentioned this pull request Oct 1, 2021
3 tasks
@@ -80,3 +80,5 @@ replace github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-

// TODO review the change introduced by https://github.com/grpc/grpc-go/pull/4416 before upgrading to 1.39.0
replace google.golang.org/grpc => google.golang.org/grpc v1.38.0

replace github.com/thanos-io/thanos v0.22.0 => github.com/thanos-io/thanos v0.19.1-0.20210923155558-c15594a03c45
Copy link
Contributor

Choose a reason for hiding this comment

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

Please, whenever you pin a version, add a comment stating why, and under what conditions we will remove the pin.

Copy link
Contributor Author

@pstibrany pstibrany Oct 1, 2021

Choose a reason for hiding this comment

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

Pin is used to make sure we use version from master. Otherwise go modules want to use v0.22, which is latest tag (update: now it’s actually v0.23, which is more recent), but is not reachable from master, so we would be stuck with version from July.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah put it in the file so I can see it and not have to trace back through PRs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bboreham
Copy link
Contributor

bboreham commented Oct 1, 2021

Here are the changes I identified in Thanos code:

  • Support matchers in LabelNames request to store. (does this need a Cortex change to call?)
  • More tracing in bucket store; add a cache name tag to relevant spans.
  • Blocks can be marked for no compaction. (not enabled in Cortex)
  • Blocks with out-of-order chunks are dropped from compaction.
  • user_assigned_id in Azure object store config. (not exposed by Cortex?)

I think the first one would deserve a mention in the changelog, if it works for users.

bboreham added a commit that referenced this pull request Oct 1, 2021
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
@bboreham bboreham mentioned this pull request Oct 1, 2021
3 tasks
bboreham added a commit that referenced this pull request Oct 1, 2021
* Add 1.11.0-rc.0 marker to CHANGELOG
* Add changelog entries for #4505

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
srijan55 pushed a commit to srijan55/cortex that referenced this pull request Nov 26, 2021
…t#4505)

* Update Thanos to v0.19.1-0.20210923155558-c15594a03c45.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Added forgotten vendored files
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Use original version of file with CRLF line separators, to avoid confusing lint check.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Manish Kumar Gupta <manishkg@microsoft.com>
srijan55 pushed a commit to srijan55/cortex that referenced this pull request Nov 26, 2021
…texproject#4507)

* Add 1.11.0-rc.0 marker to CHANGELOG
* Add changelog entries for cortexproject#4505

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
alvinlin123 pushed a commit to ac1214/cortex that referenced this pull request Jan 14, 2022
…t#4505)

* Update Thanos to v0.19.1-0.20210923155558-c15594a03c45.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Added forgotten vendored files
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Use original version of file with CRLF line separators, to avoid confusing lint check.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Alvin Lin <alvinlin@amazon.com>
alvinlin123 pushed a commit to ac1214/cortex that referenced this pull request Jan 14, 2022
…texproject#4507)

* Add 1.11.0-rc.0 marker to CHANGELOG
* Add changelog entries for cortexproject#4505

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Signed-off-by: Alvin Lin <alvinlin@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants