Skip to content

[8.19](backport #45093) otel: allow filebeat otel to load otel config files#45133

Merged
mauri870 merged 2 commits into8.19from
mergify/bp/8.19/pr-45093
Jul 2, 2025
Merged

[8.19](backport #45093) otel: allow filebeat otel to load otel config files#45133
mauri870 merged 2 commits into8.19from
mergify/bp/8.19/pr-45093

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jul 1, 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)
@mergify mergify Bot added the backport label Jul 1, 2025
@mergify mergify Bot requested review from a team as code owners July 1, 2025 15:45
@mergify mergify Bot added the backport label Jul 1, 2025
@mergify mergify Bot requested review from VihasMakwana and andrzej-stencel and removed request for a team July 1, 2025 15:46
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 1, 2025
@github-actions github-actions Bot added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jul 1, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

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 1, 2025
@mauri870 mauri870 merged commit a8a37ad into 8.19 Jul 2, 2025
200 checks passed
@mauri870 mauri870 deleted the mergify/bp/8.19/pr-45093 branch July 2, 2025 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 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