Skip to content

[8.x](backport #42913) Make agentbeat fips compliant #43264

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
pchila merged 1 commit into from
Mar 14, 2025
Merged

[8.x](backport #42913) Make agentbeat fips compliant #43264

pchila merged 1 commit into from
Mar 14, 2025

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 13, 2025

Proposed commit message

Remove from agentbeat non FIPS compliant beats when building with FIPS=true.

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

None since agentbeat built without specifying FIPS=true will still include all the previous beats and is built in the same way.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

This is an automatic backport of pull request #42913 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner March 13, 2025 09:13
@mergify mergify bot added the backport label Mar 13, 2025
@mergify mergify bot requested a review from a team as a code owner March 13, 2025 09:13
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Mar 13, 2025
@mergify mergify bot assigned pchila Mar 13, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Mar 13, 2025

Cherry-pick of 2dbb137 has failed:

On branch mergify/bp/8.x/pr-42913
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 2dbb13723.
  (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:   NOTICE.txt
	new file:   dev-tools/mage/fips-settings.yaml
	modified:   go.mod
	modified:   x-pack/agentbeat/magefile.go
	modified:   x-pack/agentbeat/main.go
	new file:   x-pack/agentbeat/prepare_root_command.go
	new file:   x-pack/agentbeat/prepare_root_command_fips.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   dev-tools/mage/settings.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

@mergify mergify bot requested review from belimawr and leehinman and removed request for a team March 13, 2025 09:13
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 13, 2025
@github-actions github-actions bot added enhancement Team:Elastic-Agent Label for the Agent team Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Mar 13, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Mar 13, 2025

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

@elasticmachine
Copy link
Contributor

elasticmachine commented Mar 13, 2025

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@elasticmachine
Copy link
Contributor

elasticmachine commented Mar 13, 2025

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 13, 2025
@pchila
Make agentbeat fips compliant (#42913)
4ab8c66 
* create FIPSConfig loaded from yaml file and filter beats

* Refactor FIPS-compliant main

* fixup! Refactor FIPS-compliant main

* Log what beats are being packaged within agentbeat

* fix go.mod

* Add placeholders in fips settings yaml

* make notice

* Skip metricbeat integration tests for agentbeat

* Fix linter false positive

* Add details about skipping metribeat integration tests

* Clarify comment about filtering beats included in agentbeat

(cherry picked from commit 2dbb137)
@pchila pchila force-pushed the mergify/bp/8.x/pr-42913 branch from 87c50f5 to 4ab8c66 Compare March 14, 2025 10:25
@pchila pchila removed the conflicts There is a conflict in the backported pull request label Mar 14, 2025
@pchila pchila enabled auto-merge (squash) March 14, 2025 10:26
@pchila pchila merged commit 3f75815 into 8.x Mar 14, 2025
145 checks passed
@pchila pchila deleted the mergify/bp/8.x/pr-42913 branch March 14, 2025 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pchila pchila pchila approved these changes

@belimawr belimawr Awaiting requested review from belimawr belimawr was automatically assigned from elastic/elastic-agent-data-plane

@leehinman leehinman Awaiting requested review from leehinman leehinman was automatically assigned from elastic/elastic-agent-data-plane

Assignees

@pchila pchila

Labels

backport enhancement Team:Elastic-Agent Label for the Agent team Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @pchila