Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2025

What does this PR do?

Re-enables the integration test for comparing logs between beats processes and beats receivers and rewrites it to use normal integration test tooling, making it simpler and more observable:

  • Instead of uninstalling and reinstalling agent with new configuration, we install it once and just let it reload the configuration, verifying that this happened via status.
  • Use the normal install process and let agent run as a service instead of running it manually.
  • Fetches the logs by running elastic-agent logs instead of capturing agent output directly.
  • Relax the status check to only verify what we care about. This test sets an ES host that doesn't exist, so the status will eventually be degraded, but the test doesn't really care about this.

Why is it important?

This test should be enabled and reliable.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • 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/fragments using the changelog tool
  • I have added an integration test or an E2E test

Related issues


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

* Rewrite the beats receiver log test using common tooling

* Expect the outputs to be degraded

* Relax checks

* Fix assertion

* Apply suggestion from @ycombinator

Co-authored-by: Shaunak Kashyap <[email protected]>

* Apply suggestion from @ycombinator

Co-authored-by: Shaunak Kashyap <[email protected]>

* Apply suggestion from @ycombinator

Co-authored-by: Shaunak Kashyap <[email protected]>

* Switch assert to required

* Fix constants

---------

Co-authored-by: Shaunak Kashyap <[email protected]>
(cherry picked from commit 71ece0d)

# Conflicts:
#	testing/integration/ess/beat_receivers_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 11, 2025
@mergify mergify bot requested a review from a team as a code owner October 11, 2025 17:44
@mergify mergify bot requested review from kaanyalti and rubenruizdegauna and removed request for a team October 11, 2025 17:44
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Oct 11, 2025
Copy link
Contributor Author

mergify bot commented Oct 11, 2025

Cherry-pick of 71ece0d has failed:

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

You are currently cherry-picking commit 71ece0de9.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testing/integration/ess/beat_receivers_test.go

no changes added to commit (use "git add" and/or "git commit -a")

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

@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team flaky-test Unstable or unreliable test cases. skip-changelog chore Tasks that just need to be done, they are neither bug, nor enhancements labels Oct 11, 2025
@elasticmachine
Copy link
Collaborator

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

@swiatekm
Copy link
Contributor

We don't have this test in 9.0, so this backport is unnecessary.

@swiatekm swiatekm closed this Oct 11, 2025
@mergify mergify bot deleted the mergify/bp/9.0/pr-10153 branch October 11, 2025 17:47
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 11, 2025

💔 Build Failed

Failed CI Steps

History

cc @swiatekm

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

Labels

backport chore Tasks that just need to be done, they are neither bug, nor enhancements conflicts There is a conflict in the backported pull request flaky-test Unstable or unreliable test cases. skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants