Skip to content

Conversation

@mergify
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).

@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:45
@mergify mergify bot requested review from michalpristas and swiatekm and removed request for a team October 11, 2025 17:45
@mergify
Copy link
Contributor Author

mergify bot commented Oct 11, 2025

Cherry-pick of 71ece0d has failed:

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

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
Contributor

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

@mergify
Copy link
Contributor Author

mergify bot commented Oct 13, 2025

This pull request has not been merged yet. Could you please review and merge it @swiatekm? 🙏

@ebeahan
Copy link
Member

ebeahan commented Oct 13, 2025

@swiatekm CI failed on this backport - can you take a look?

@swiatekm
Copy link
Contributor

Looks like this test wasn't originally ported to this branch, which seems like an oversight. I'll see if there's any obstruction to doing so.

swiatekm
swiatekm previously approved these changes Oct 15, 2025
@swiatekm swiatekm enabled auto-merge (squash) October 15, 2025 11:28
@swiatekm
Copy link
Contributor

There's currently some changes missing in 9.1 whose lack makes this test flaky, so I'll skip backporting it.

@swiatekm swiatekm closed this Oct 15, 2025
auto-merge was automatically disabled October 15, 2025 14:41

Pull request was closed

@swiatekm swiatekm deleted the mergify/bp/9.1/pr-10153 branch October 15, 2025 14:41
@swiatekm swiatekm restored the mergify/bp/9.1/pr-10153 branch October 24, 2025 16:06
@swiatekm swiatekm reopened this Oct 24, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Oct 24, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/9.1/pr-10153 upstream/mergify/bp/9.1/pr-10153
git merge upstream/9.1
git push upstream mergify/bp/9.1/pr-10153

@swiatekm swiatekm enabled auto-merge (squash) October 24, 2025 17:35
@mergify
Copy link
Contributor Author

mergify bot commented Oct 27, 2025

This pull request has not been merged yet. Could you please review and merge it @swiatekm? 🙏

@swiatekm swiatekm force-pushed the mergify/bp/9.1/pr-10153 branch from 8881b8a to f4f6063 Compare October 27, 2025 09:45
@swiatekm
Copy link
Contributor

Looks like the windows tests are failing because Vihas' fix for retrying npipes in beats is not yet in this branch. And it looks like #10849 needs to go in first.

@swiatekm swiatekm force-pushed the mergify/bp/9.1/pr-10153 branch from f4f6063 to 235e442 Compare October 28, 2025 18:29
@swiatekm swiatekm merged commit 0e5e2cc into 9.1 Oct 28, 2025
21 checks passed
@swiatekm swiatekm deleted the mergify/bp/9.1/pr-10153 branch October 28, 2025 20:16
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

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.

4 participants