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.

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

grafana-agent: 0.41.0 -> 0.41.1 #318063

Merged
merged 1 commit into from
Jun 8, 2024
Merged

Conversation

emilylange
Copy link
Member

Description of changes

Fixes CVE-2024-36129.

https://github.com/grafana/agent/releases/tag/v0.41.1

https://github.com/grafana/agent/blob/v0.41.1/CHANGELOG.md

diff: grafana/agent@v0.41.0...v0.41.1

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@katexochen katexochen left a comment

Choose a reason for hiding this comment

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

Result of nixpkgs-review pr 318063 run on x86_64-linux 1

1 package built:
  • grafana-agent

@emilylange
Copy link
Member Author

emilylange commented Jun 7, 2024

@katexochen you added the backport label, but this cannot be backported.

24.05 is on 0.40.5 and 0.41.0 had breaking changes.

We could cherry-pick the upstream OpenTelemetry version bump commit on top of 0.40.5 though.

@emilylange emilylange removed the backport release-24.05 Backport PR automatically label Jun 7, 2024
@flokli flokli merged commit ed5f4b9 into NixOS:master Jun 8, 2024
31 checks passed
@emilylange emilylange deleted the grafana-agent branch June 8, 2024 12:53
@emilylange
Copy link
Member Author

We could cherry-pick the upstream OpenTelemetry version bump commit on top of 0.40.5 though.

We would have to cherry-pick grafana/agent#6725 and grafana/agent#6940 (grafana/agent#6945), which I don't think is all that viable anymore.

CVE-2024-36129 isn't that bad imho, so /shrug

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants