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

Fix issue with fips on behalf of @andrewimeson #4622

Merged
merged 1 commit into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ Main (unreleased)
was rolled back, resulting in "dropped sample for series that was not
explicitly dropped via relabelling" log messages. (@rfratto)

- Fix RPM file digests so that installation on FIPS-enabled systems succeeds. (@andrewimeson)

### Other changes

- Compile journald support into builds of `grafana-agentctl` so
Expand Down
1 change: 1 addition & 0 deletions packaging/grafana-agent-flow/rpm/gpg-sign.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ echo "%_gpg_name Grafana Labs <[email protected]>
%_gpg_path /root/.gnupg
%_gpgbin /usr/bin/gpg
%_gpg_digest_algo sha256
%_binary_filedigest_algorithm 8
%__gpg /usr/bin/gpg
%__gpg_sign_cmd %{__gpg} \
gpg --no-tty --batch --yes --no-verbose --no-armor \
Expand Down
1 change: 1 addition & 0 deletions packaging/grafana-agent/rpm/gpg-sign.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ echo "%_gpg_name Grafana Labs <[email protected]>
%_gpg_path /root/.gnupg
%_gpgbin /usr/bin/gpg
%_gpg_digest_algo sha256
%_binary_filedigest_algorithm 8
%__gpg /usr/bin/gpg
%__gpg_sign_cmd %{__gpg} \
gpg --no-tty --batch --yes --no-verbose --no-armor \
Expand Down