Skip to content

Conversation

belimawr
Copy link
Contributor

@belimawr belimawr commented Sep 24, 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?
  • ...

@belimawr belimawr self-assigned this Sep 24, 2025
@belimawr belimawr added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Sep 24, 2025
Copy link
Contributor

mergify bot commented Sep 24, 2025

This pull request does not have a backport label. Could you fix it @belimawr? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label that automatically backports to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@belimawr belimawr marked this pull request as ready for review September 25, 2025 13:06
@belimawr belimawr requested a review from a team as a code owner September 25, 2025 13:06
@elasticmachine
Copy link
Collaborator

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

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

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Sep 26, 2025
@elasticmachine
Copy link
Collaborator

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

@pkoutsovasilis
Copy link
Contributor

@belimawr should we backport this PR to resolve the issues to all active branches?

@belimawr belimawr added the backport-active-all Automated backport with mergify to all the active branches label Sep 26, 2025
@belimawr belimawr merged commit 5f0f2fd into elastic:main Sep 26, 2025
27 checks passed
Copy link
Contributor

@Mergifyio backport 8.18 8.19 9.0 9.1

Copy link
Contributor

mergify bot commented Sep 26, 2025

backport 8.18 8.19 9.0 9.1

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Sep 26, 2025
…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 bot pushed a commit that referenced this pull request Sep 26, 2025
…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 bot pushed a commit that referenced this pull request Sep 26, 2025
…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-input.yml
#	testing/integration/k8s/testdata/journald-otel.yml
mergify bot pushed a commit that referenced this pull request Sep 26, 2025
…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
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-active-all Automated backport with mergify to all the active branches 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.

7 participants