8000 [8.19](backport #43840) Add FIPS indicator to startup and version command by mergify[bot] · Pull Request #44122 · elastic/beats · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[8.19](backport #43840) Add FIPS indicator to startup and version command #44122

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
Merged
merged 5 commits into from
Apr 30, 2025
Merged

[8.19](backport #43840) Add FIPS indicator to startup and version command #44122

merged 5 commits into from
Apr 30, 2025

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Apr 29, 2025

Proposed commit message

Add a boolean FIPS indicator to the version command as well as beat startup logs.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Output of version command has changed to include FIPS indicator.

This is an automatic backport of pull request #43840 done by Mergify.

@michel-laterman @mergify
Add FIPS indicator to startup and version command (#43840)
70d52b1 
* Add FIPS indicator to startup and version command

* Rename FIPS variables to FIPSDistribution

* Reword FIPS in version and log to FIPS-distribution

(cherry picked from commit 868cf62)

# Conflicts:
#	libbeat/cmd/instance/beat.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 29, 2025
@mergify mergify bot requested a review from a team as a code owner April 29, 2025 16:47
@mergify mergify bot requested review from faec and leehinman and removed request for a team April 29, 2025 16:47
@mergify Mergify
Copy link
Contributor Author
mergify bot commented Apr 29, 2025

Cherry-pick of 868cf62 has failed:

On branch mergify/bp/8.19/pr-43840
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 868cf6248.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   libbeat/beat/info.go
	modified:   libbeat/cmd/version.go
	new file:   libbeat/version/fips.go
	new file:   libbeat/version/nofips.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/cmd/instance/beat.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 29, 2025
@github-actions github-actions bot added enhancement release-note:skip The PR should be ignored when processing the changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Apr 29, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 29, 2025
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@michel-laterman michel-laterman enabled auto-merge (squash) April 30, 2025 14:15
@michel-laterman michel-laterman merged commit 6979356 into 8.19 Apr 30, 2025
189 of 193 checks passed
@michel-laterman michel-laterman deleted the mergify/bp/8.19/pr-43840 branch April 30, 2025 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michel-laterman michel-laterman michel-laterman approved these changes

@faec faec Awaiting requested review from faec faec is a code owner automatically assigned from elastic/elastic-agent-data-plane

@leehinman leehinman Awaiting requested review from leehinman leehinman is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@michel-laterman michel-laterman

Labels
backport conflicts There is a conflict in the backported pull request enhancement release-note:skip The PR should be ignored when processing the changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@elasticmachine @michel-laterman
0