Skip to content

[9.1](backport #45093) otel: allow filebeat otel to load otel config files #45324

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

Draft
wants to merge 10 commits into
base: 9.1
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 11, 2025

Proposed commit message

Currently the filebeat otel command only loads beats config files, which it then translates to beats receivers in order to run a OTel collector.

This PR augments this functionality to allow the command to load otel configuration files, this aids in testing and running beats receivers in a standalone collector without depending on EDOT.

How to test

cd x-pack/filebeat/
go test -c -tags otelbeat
mage docker:composeUp
go test   -tags "integration" -run 'TestFilebeatOTel.*' ./tests/integration -v -count=1

Checklist

  • 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.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related

* otel: allow filebeat otel to load otel config files

Currently the filebeat otel command only loads beats config files, which
it then translates to beats receivers in order to run a OTel collector.

This PR augments this functionality to allow the command to load otel
configuration files, this aids in testing and running beats receivers in a standalone collector.

* update notice

* add test for multiple receivers

* fix monitoring port

* test refactor for template

* restore condition removed by mistake

* allow monitoring http request with variable url

(cherry picked from commit 46e855e)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	x-pack/libbeat/common/otelbeat/otel.go
@mergify mergify bot requested review from a team as code owners July 11, 2025 13:37
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 11, 2025
@mergify mergify bot requested review from khushijain21 and andrzej-stencel and removed request for a team July 11, 2025 13:37
Copy link
Contributor Author

mergify bot commented Jul 11, 2025

Cherry-pick of 46e855e has failed:

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

You are currently cherry-picking commit 46e855e22.
  (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:   libbeat/otelbeat/beatconverter/beatconverter.go
	modified:   x-pack/filebeat/tests/integration/otel_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   x-pack/libbeat/common/otelbeat/otel.go

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

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 11, 2025
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 11, 2025
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@github-actions github-actions bot added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jul 11, 2025
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 11, 2025
@mauri870 mauri870 force-pushed the mergify/bp/9.1/pr-45093 branch 2 times, most recently from 8c0afd0 to 0267a86 Compare July 11, 2025 14:28
@mauri870 mauri870 force-pushed the mergify/bp/9.1/pr-45093 branch from 0267a86 to a7ef8d1 Compare July 11, 2025 14:40
@mauri870 mauri870 marked this pull request as draft July 11, 2025 19:41
Copy link
Contributor Author

mergify bot commented Jul 14, 2025

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

@mauri870 mauri870 force-pushed the mergify/bp/9.1/pr-45093 branch from 358b2de to 41221ad Compare July 18, 2025 13:16
Copy link
Contributor Author

mergify bot commented Jul 21, 2025

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

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.

2 participants