Update journald tests now that Filebeat supports watching folders#10131
Merged
belimawr merged 6 commits intoelastic:mainfrom Sep 26, 2025
Merged
Update journald tests now that Filebeat supports watching folders#10131belimawr merged 6 commits intoelastic:mainfrom
belimawr merged 6 commits intoelastic:mainfrom
Conversation
Contributor
|
This pull request does not have a backport label. Could you fix it @belimawr? 🙏
|
This was referenced Sep 24, 2025
Contributor
|
Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane) |
cmacknz
reviewed
Sep 25, 2025
|
Contributor
💛 Build succeeded, but was flaky
Failed CI StepsHistory
cc @belimawr |
Contributor
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
Contributor
|
@belimawr should we backport this PR to resolve the issues to all active branches? |
pchila
approved these changes
Sep 26, 2025
swiatekm
reviewed
Sep 26, 2025
swiatekm
approved these changes
Sep 26, 2025
Contributor
|
@Mergifyio backport 8.18 8.19 9.0 9.1 |
Contributor
✅ Backports have been createdDetails
|
Merged
8 tasks
Merged
8 tasks
Closed
8 tasks
Merged
8 tasks
v1v
added a commit
that referenced
this pull request
Sep 26, 2025
* upstream: (505 commits) Update journald tests now that Filebeat supports watching folders (#10131) [deploy/kubernetes]: add info about hostPID for Universal Profiling (#10173) Fall back to process runtime if otel runtime is unsupported (#10087) Conditionall check for ms_tls13kdf build tag (#10160) [docs][edot] add entry for profiles (#10163) edot/docs: add support for profiles (#10146) Add Logstash exporter (#10137) Add back publish to serverless. (#10159) Improve Integration test documentation (#10155) Fix multiarch service image push from main to serverless (#10129) Forward migrate action to endpoint (#9801) Comment out check for ms_tls13kdf tag for FIPS-capable binaries (#10148) [otel] add receivers: apache, iis, mysql, postgresql, sqlserver v0.135.0 (#9344) Add k8sevents receiver in kube-stack (#10086) feat: emit system resource metrics for EDOT subprocess (#10003) [AutoOps] Configure OTel Exporter to Send Maximum-sized Batches (#10126) keep enrollment token when replacing data with signed (#10115) Revert "Publish `elastic-agent-service` container directly to serverless from main (#9583)" (#10127) Add agent_policy_id and policy_revision_idx to checkin requests (#9931) remove resource/k8s processor and use k8sattributes processor for service attributes (#10108) ...
swiatekm
pushed a commit
that referenced
this pull request
Sep 26, 2025
…rts watching folders (#10181) * Update journald tests now that Filebeat supports watching folders (#10131) (cherry picked from commit 5f0f2fd) # Conflicts: # .package-version # NOTICE-fips.txt # NOTICE.txt # go.mod # go.sum # internal/pkg/otel/translate/otelconfig_test.go * Fix merge conflicts * Update package version --------- Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co>
belimawr
added a commit
that referenced
this pull request
Sep 26, 2025
…orts watching folders (#10179) (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 --------- Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co>
swiatekm
pushed a commit
that referenced
this pull request
Sep 28, 2025
…orts watching folders (#10178) * Update journald tests now that Filebeat supports watching folders (#10131) (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 * Update package versions for 8.18 and fix merge conflicts * update package version --------- Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.





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 made corresponding changes to the documentationI have made corresponding change to the default configuration filesI have added tests that prove my fix is effective or that my feature worksI have added an entry in./changelog/fragmentsusing the changelog toolI have added an integration test or an E2E test## Disruptive User ImpactHow to test this PR locally
## Related issuesQuestions to ask yourself