Cherry pick latest main changes into 2.48#12985
Merged
roidelapluie merged 11 commits intoprometheus:release-2.48from Oct 15, 2023
Merged
Cherry pick latest main changes into 2.48#12985roidelapluie merged 11 commits intoprometheus:release-2.48from
roidelapluie merged 11 commits intoprometheus:release-2.48from
Conversation
LeviHarrison
requested review from
bwplotka,
csmarchbanks,
cstyan,
dgl,
jesusvazquez,
roidelapluie and
tomwilkie
as code owners
LeviHarrison
force-pushed
the
merge-main-release-2.48
branch
3 times, most recently
from
9146dde to
d87d8f5
Compare
Signed-off-by: Arthur Silva Sens <[email protected]> Signed-off-by: Levi Harrison <[email protected]>
…ules/github.com/aws/aws-sdk-go-1.45.19 build(deps): bump github.com/aws/aws-sdk-go from 1.44.317 to 1.45.19 Signed-off-by: Levi Harrison <[email protected]>
…ules/k8s-io-815bab050d build(deps): bump the k8s-io group with 2 updates Signed-off-by: Levi Harrison <[email protected]>
…ules/golang.org/x/net-0.15.0 build(deps): bump golang.org/x/net from 0.13.0 to 0.15.0 Signed-off-by: Levi Harrison <[email protected]>
* Additionally wrap WBL replay error Although WBL replay is already wrapped with errLoadWbl, there are other errors that can happen during a WBL replay. We should not try to repair WAL in those cases. This commit additionally wraps the final error in Head.Init again with errLoadWbl so that WBL replay errors can be identified properly. Signed-off-by: Ganesh Vernekar <[email protected]> Signed-off-by: Jesus Vazquez <[email protected]> Co-authored-by: Jesus Vazquez <[email protected]> Signed-off-by: Levi Harrison <[email protected]>
Signed-off-by: Paschalis Tsilias <[email protected]> Signed-off-by: Levi Harrison <[email protected]>
Signed-off-by: Levi Harrison <[email protected]>
Improve promtool tsdb analyze - Make it more suitable for variable size float chunks. - Add support for histogram chunks. --------- Signed-off-by: Ziqi Zhao <[email protected]> Signed-off-by: Levi Harrison <[email protected]>
…ules/documentation/examples/remote_storage/github.com/prometheus/prometheus-0.47.2 build(deps): bump github.com/prometheus/prometheus from 0.45.0 to 0.47.2 in /documentation/examples/remote_storage Signed-off-by: Levi Harrison <[email protected]>
…metheus#12982) Related to PR prometheus#12152 Signed-off-by: Julius Volz <[email protected]> Signed-off-by: Levi Harrison <[email protected]>
Signed-off-by: Levi Harrison <[email protected]>
LeviHarrison
force-pushed
the
merge-main-release-2.48
branch
from
d87d8f5 to
454a0a2
Compare
Member
|
Thanks! |
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
6 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.
All but #12738