Skip to content

Cherry pick latest main changes into 2.48#12985

Merged
roidelapluie merged 11 commits intoprometheus:release-2.48from
LeviHarrison:merge-main-release-2.48
Oct 15, 2023
Merged

Cherry pick latest main changes into 2.48#12985
roidelapluie merged 11 commits intoprometheus:release-2.48from
LeviHarrison:merge-main-release-2.48

Conversation

@LeviHarrison
Copy link
Copy Markdown
Contributor

All but #12738

Arthur Silva Sens and others added 11 commits October 15, 2023 13:47
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
…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 <git@leviharrison.dev>
…ules/k8s-io-815bab050d

build(deps): bump the k8s-io group with 2 updates

Signed-off-by: Levi Harrison <git@leviharrison.dev>
…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 <git@leviharrison.dev>
* 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 <ganeshvern@gmail.com>
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
Co-authored-by: Jesus Vazquez <jesusvzpg@gmail.com>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
Improve promtool tsdb analyze

- Make it more suitable for variable size float chunks.
- Add support for histogram chunks.

---------

Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
…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 <git@leviharrison.dev>
…metheus#12982)

Related to PR prometheus#12152

Signed-off-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
@LeviHarrison LeviHarrison force-pushed the merge-main-release-2.48 branch from d87d8f5 to 454a0a2 Compare October 15, 2023 17:48
@roidelapluie roidelapluie merged commit 8a0c9ae into prometheus:release-2.48 Oct 15, 2023
@roidelapluie
Copy link
Copy Markdown
Member

Thanks!

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.

6 participants