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.x](backport #5648) [testing/integration]: fix TestLogIngestionFleetManaged #5751

Merged
merged 4 commits into from
Oct 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2024

Looking at diagnostics of #5631 failure, it was clear that the monitoring units were not healthy. This is a known issue and it takes some time for them to be healthy.

This PR aims to fix that by making sure the components are healthy before proceeding with the test case.

fix TestLogIngestionFleetManaged

---------

Co-authored-by: Paolo Chilà <paolo.chila@elastic.co>
Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
(cherry picked from commit 26f3d59)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner October 10, 2024 02:15
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 10, 2024
@mergify mergify bot requested review from michel-laterman and swiatekm and removed request for a team October 10, 2024 02:15
Copy link
Contributor Author

mergify bot commented Oct 10, 2024

Cherry-pick of 26f3d59 has failed:

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

You are currently cherry-picking commit 26f3d5975e.
  (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
	modified:   testing/integration/logs_ingestion_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

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

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Oct 10, 2024
@elasticmachine
Copy link
Contributor

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

@blakerouse blakerouse enabled auto-merge (squash) October 10, 2024 13:39
Copy link

@blakerouse blakerouse merged commit 7812e99 into 8.x Oct 10, 2024
14 checks passed
@blakerouse blakerouse deleted the mergify/bp/8.x/pr-5648 branch October 10, 2024 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants