Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 23, 2025

Proposed commit message

This PR removes HTTP settings from ES-exporter config that are supported by beatsauthextension instead ref

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.

Disruptive User Impact

HTTP settings should be configured with beatsauthextension for 1:1 compatibility with beats and beatreceivers

Related issues


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

* Remove settings on ES exporter config that no longer function

(cherry picked from commit d3be9bf)

# Conflicts:
#	go.mod
#	go.sum
#	libbeat/otelbeat/beatconverter/beatconverter.go
#	libbeat/otelbeat/beatconverter/beatconverter_test.go
#	x-pack/filebeat/tests/integration/otel_test.go
#	x-pack/libbeat/common/otelbeat/otel.go
#	x-pack/metricbeat/tests/integration/otel_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 23, 2025
@mergify mergify bot requested review from a team as code owners September 23, 2025 06:54
@mergify mergify bot added the backport label Sep 23, 2025
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 23, 2025
@mergify mergify bot removed the request for review from a team September 23, 2025 06:54
Copy link
Contributor Author

mergify bot commented Sep 23, 2025

Cherry-pick of d3be9bf has failed:

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

You are currently cherry-picking commit d3be9bf15.
  (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:   NOTICE.txt
	modified:   libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go
	modified:   libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   libbeat/otelbeat/beatconverter/beatconverter.go
	both modified:   libbeat/otelbeat/beatconverter/beatconverter_test.go
	both modified:   x-pack/filebeat/tests/integration/otel_test.go
	both modified:   x-pack/libbeat/common/otelbeat/otel.go
	both modified:   x-pack/metricbeat/tests/integration/otel_test.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 requested review from leehinman and khushijain21 September 23, 2025 06:54
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 23, 2025
@github-actions github-actions bot added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Sep 23, 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 Sep 23, 2025
@khushijain21 khushijain21 enabled auto-merge (squash) September 23, 2025 16:08
@khushijain21
Copy link
Contributor

Requires this PR to be backported #46464

Copy link
Contributor Author

mergify bot commented Sep 26, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.19/pr-46428 upstream/mergify/bp/8.19/pr-46428
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-46428

Copy link
Contributor Author

mergify bot commented Sep 29, 2025

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

1 similar comment
Copy link
Contributor Author

mergify bot commented Oct 6, 2025

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

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