Update Thanos and Prometheus#4560
Merged
pracucci merged 5 commits intocortexproject:masterfrom Nov 24, 2021
Merged
Conversation
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
pstibrany
force-pushed
the
update-thanos-and-prometheus
branch
from
d40f6be to
7afcee6
Compare
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
…block in a group, so we added more blocks. Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
pstibrany
force-pushed
the
update-thanos-and-prometheus
branch
from
3323764 to
74b72dd
Compare
pstibrany
commented
Nov 23, 2021
| logger, | ||
| func(context.Context) v1.RulesRetriever { return &querier.DummyRulesRetriever{} }, | ||
| 0, 0, 0, // Remote read samples and concurrency limit. | ||
| false, |
Contributor
Author
There was a problem hiding this comment.
isAgent parameter
pstibrany
commented
Nov 23, 2021
| @@ -1,3 +1,4 @@ | |||
| //go:build requires_docker | |||
Contributor
Author
There was a problem hiding this comment.
These are added by goimport.
pstibrany
commented
Nov 23, 2021
| bucketClient := &bucket.ClientMock{} | ||
| bucketClient.MockIter("", []string{userID}, nil) | ||
| bucketClient.MockIter(userID+"/", []string{userID + "/01DTVP434PA9VFXSW2JKB3392D"}, nil) | ||
| bucketClient.MockIter(userID+"/", []string{userID + "/01DTVP434PA9VFXSW2JKB3392D", userID + "/01FN6CDF3PNEWWRY5MPGJPE3EX"}, nil) |
Contributor
Author
There was a problem hiding this comment.
Group is no longer compacted if it has only single block, so we need more blocks in compactor tests.
pstibrany
commented
Nov 23, 2021
| return false | ||
| } | ||
|
|
||
| func TestYamlFormatting(t *testing.T) { |
Contributor
Author
There was a problem hiding this comment.
Added this test to speed up debugging YAML formatting issue.
srijan55
pushed a commit
to srijan55/cortex
that referenced
this pull request
Nov 26, 2021
* Update Thanos and Prometheus Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix imports. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix imports. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix compactor tests. Planning no longer runs if there is only single block in a group, so we added more blocks. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix ruler tests. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> Signed-off-by: Manish Kumar Gupta <manishkg@microsoft.com>
simonswine
pushed a commit
to grafana/e2e
that referenced
this pull request
Jan 13, 2022
* Update Thanos and Prometheus Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix imports. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix imports. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix compactor tests. Planning no longer runs if there is only single block in a group, so we added more blocks. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix ruler tests. Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
alvinlin123
pushed a commit
to ac1214/cortex
that referenced
this pull request
Jan 14, 2022
* Update Thanos and Prometheus Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix imports. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix imports. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix compactor tests. Planning no longer runs if there is only single block in a group, so we added more blocks. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix ruler tests. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> Signed-off-by: Alvin Lin <alvinlin@amazon.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 updates Thanos and Prometheus to latest main of the respective projects.
Prometheus has renamed some packages and introduced new types for series and chunk references, which prompted lot of changes across whole codebase.
I haven't yet checked updates in dependencies.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]