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

[8.14](backport #39064) Agentbeat: remove unused files from package and silence new error message #39159

Merged
merged 1 commit into from Apr 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 23, 2024

Removes the individual beat configuration files and the README from the agentbeat package. Beats don't read their configuration files when running under agent since 8.6, and the README is wrong for agentbeat (but not the other beats it is templated for).

I also silenced a new error log I noticed that results because the modules sub-directory is no longer present.

The package contents after this change are:

❯ ls agentbeat-8.15.0-darwin-aarch64/
LICENSE.txt           agentbeat             certs                 osquery-extension.ext
NOTICE.txt            agentbeat.spec.yml    lenses                osquery.app

The certs and lenses directories are osquery specific.

What is included in an 8.14.0 agent is (Notice the presence of the readme and beat config files):

❯ ls elastic-agent-8.14.0-SNAPSHOT-darwin-aarch64/data/elastic-agent-883cf0/components
LICENSE.txt                     checksum.yml                    heartbeat.yml
NOTICE.txt                      endpoint-security               lenses
README.md                       endpoint-security-resources.zip metricbeat.yml
agentbeat                       endpoint-security.spec.yml      osquery-extension.ext
agentbeat.spec.yml              filebeat.yml                    osquery.app
auditbeat.yml                   fleet-server                    osquerybeat.yml
certs                           fleet-server.spec.yml           packetbeat.yml

Tested by extracting the new package into the components directory of a new agent and making sure the Beats start. I don't know that we have a better way to test agentbeat in this repository yet.


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

…sage (#39064)

* Remove Beat config files from agentbeat.

Beats no longer reads config files at startup when run as part of agent.

* Silence new error message with agentbeat.

* Add comment to log line.

(cherry picked from commit e6cae46)
@mergify mergify bot requested a review from a team as a code owner April 23, 2024 12:55
@mergify mergify bot added the backport label Apr 23, 2024
@mergify mergify bot requested review from rdner and fearful-symmetry and removed request for a team April 23, 2024 12:55
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 23, 2024
@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Apr 23, 2024
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 23, 2024
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 249 min 52 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@cmacknz cmacknz merged commit d3b2beb into 8.14 Apr 23, 2024
193 of 209 checks passed
@cmacknz cmacknz deleted the mergify/bp/8.14/pr-39064 branch April 23, 2024 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants