Update Cortex and remove usage of Prometheus fork. #4898
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
Signed-off-by: Peter Štibraný <[email protected]>
…nter happy. Signed-off-by: Peter Štibraný <[email protected]>
|
To make linter happy, I've also migrated import paths from |
Signed-off-by: Peter Štibraný <[email protected]>
GiedriusS
approved these changes
Nov 25, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR finishes update of Prometheus started in PR #4882. There we had to use custom fork of Prometheus with some deprecated packages, because Cortex was still using them. Now that Cortex has been updated by cortexproject/cortex#4560, we can finish Prometheus update in Thanos and remove use of Prometheus fork.
Query-frontend interfaces changed due to cortexproject/cortex#4486. Feature from that PR has not been integrated in this PR.