Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 26, 2025

What does this PR do?

It updates the Journald tests so they're use a folder instead of a glob pattern, which fixes some errors that started appearing after elastic/beats#46682 was merged.

It also updates the Beats dependency version so it includes the fix mentioned above.

Why is it important?

CI was constantly failing, some examples:

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

## Disruptive User Impact

How to test this PR locally

DEV=true SNAPSHOT=true EXTERNAL=true PACKAGES="docker" DOCKER_VARIANTS="basic,complete,elastic-otel-collector" PLATFORMS=linux/amd64 mage -v package
SNAPSHOT=true INSTANCE_PROVISIONER=kind mage -v integration:testKubernetesSingle TestKubernetesJournaldInputOtel
SNAPSHOT=true INSTANCE_PROVISIONER=kind mage -v integration:testKubernetesSingle TestKubernetesJournaldInput

## Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

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

…0131)

(cherry picked from commit 5f0f2fd)

# Conflicts:
#	.package-version
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/translate/otelconfig_test.go
#	testing/integration/k8s/testdata/journald-otel.yml
@mergify mergify bot requested a review from a team as a code owner September 26, 2025 15:32
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 26, 2025
@mergify mergify bot requested review from blakerouse and straistaru and removed request for a team September 26, 2025 15:32
Copy link
Contributor Author

mergify bot commented Sep 26, 2025

Cherry-pick of 5f0f2fd has failed:

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

You are currently cherry-picking commit 5f0f2fd3b.
  (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:   testing/integration/k8s/testdata/journald-input.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .package-version
	deleted by us:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   internal/pkg/otel/translate/otelconfig_test.go
	deleted by us:   testing/integration/k8s/testdata/journald-otel.yml

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 Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team skip-changelog labels Sep 26, 2025
@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

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

@belimawr belimawr force-pushed the mergify/bp/8.18/pr-10131 branch from 0de486f to afb8ac1 Compare September 26, 2025 16:18
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @belimawr

@swiatekm swiatekm merged commit a990dd9 into 8.18 Sep 28, 2025
18 checks passed
@swiatekm swiatekm deleted the mergify/bp/8.18/pr-10131 branch September 28, 2025 17:19
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 skip-changelog 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
Development

Successfully merging this pull request may close these issues.

3 participants