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.

Sign up for GitHub

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

Jump to bottom

Cherry picks for v0.37.2 #5484

Merged
merged 6 commits into from
Oct 16, 2023
Merged

Cherry picks for v0.37.2 #5484

merged 6 commits into from
Oct 16, 2023

Conversation

tpaschalis
Copy link
Member

This PR cherry-picks multiple commits to prepare for a v0.37.2 patch release:

  • Bumps our Prometheus dependency to v2.47.2 along with our retry improvements to fix two bugs with native histograms
  • Bumps Go to v1.21.3 to resolve the recent HTTP/2 CVE
  • Updates our Ubuntu packages to the latest
  • Fixes a bug in clustering's handle of the --cluster.join-addresses CLI flag.
  • Fixes an issue with the converter and the blackbox exporter

tpaschalis and others added 6 commits October 16, 2023 13:41
@tpaschalis
Update Prometheus dependency to v2.47.2 (grafana#5453)
42c36ca 
Signed-off-by: Paschalis Tsilias <[email protected]>
(cherry picked from commit ca7226d)
@erikbaranowski @tpaschalis
Fix an issue with the static to flow converter for blackbox exporter …
5ecd1e7 
…modules (grafana#5476)

config not being included in the river output.

Signed-off-by: erikbaranowski <[email protected]>
(cherry picked from commit 04b90c6)
@tpaschalis
clustering: fix handling of empty join-addresses flag (grafana#5454)
32f3b06 
Signed-off-by: Paschalis Tsilias <[email protected]>
(cherry picked from commit 0a5a5aa)
@captncraig @tpaschalis
upgrade packages in dockerfile (grafana#5463)
47dfbf8 
* update to ubuntu:mantic

* back to lunar, but with upgrade

(cherry picked from commit 1c370a0)
@ptodev @tpaschalis
"apt-get upgrade" in agentctl and operator docker images (grafana#5471)
3f9032e 
(cherry picked from commit d597d56)
@tpaschalis
build: bump build image usage to 0.30.3 (grafana#5483)
e3c4ce6 
Signed-off-by: Paschalis Tsilias <[email protected]>
(cherry picked from commit a202b0a)
@tpaschalis tpaschalis requested review from a team as code owners October 16, 2023 13:07
erikbaranowski
erikbaranowski approved these changes Oct 16, 2023
View reviewed changes
Copy link
Contributor

@erikbaranowski erikbaranowski left a comment

Choose a reason for hiding this comment

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

Converter bug fix LGTM. Thanks!

@tpaschalis tpaschalis merged commit be397c3 into grafana:release-v0.37 Oct 16, 2023
@tpaschalis tpaschalis deleted the cherry-picks-v0.37.2 branch October 16, 2023 13:15
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Feb 21, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@erikbaranowski erikbaranowski erikbaranowski approved these changes

Assignees
No one assigned
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tpaschalis @erikbaranowski @captncraig @ptodev