Skip to content

[9.1](backport #46428) Remove settings on ES exporter config that no longer function#46736

Merged
pierrehilbert merged 18 commits into
9.1from
mergify/bp/9.1/pr-46428
Oct 17, 2025
Merged

[9.1](backport #46428) Remove settings on ES exporter config that no longer function#46736
pierrehilbert merged 18 commits into
9.1from
mergify/bp/9.1/pr-46428

Conversation

@mergify
Copy link
Copy Markdown
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
#	libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go
#	x-pack/libbeat/common/otelbeat/otel.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:55
@mergify mergify Bot requested review from AndersonQ and removed request for a team September 23, 2025 06:55
@mergify mergify Bot requested a review from belimawr September 23, 2025 06:55
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Sep 23, 2025

Cherry-pick of d3be9bf has failed:

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

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_test.go
	modified:   x-pack/filebeat/tests/integration/otel_test.go
	modified:   x-pack/metricbeat/tests/integration/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:   libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go
	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

@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 23, 2025
@github-actions
Copy link
Copy Markdown
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 Sep 23, 2025
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 23, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

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

@khushijain21 khushijain21 enabled auto-merge (squash) September 23, 2025 16:08
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Sep 24, 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/9.1/pr-46428 upstream/mergify/bp/9.1/pr-46428
git merge upstream/9.1
git push upstream mergify/bp/9.1/pr-46428

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Sep 29, 2025

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

2 similar comments
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 6, 2025

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

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 13, 2025

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

@pierrehilbert
Copy link
Copy Markdown
Contributor

@khushijain21 could you please resolve the conflicts?

auto-merge was automatically disabled October 13, 2025 14:08

Pull request was closed

@mergify mergify Bot deleted the mergify/bp/9.1/pr-46428 branch October 13, 2025 14:09
@khushijain21 khushijain21 restored the mergify/bp/9.1/pr-46428 branch October 14, 2025 05:44
@khushijain21 khushijain21 reopened this Oct 14, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 14, 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/9.1/pr-46428 upstream/mergify/bp/9.1/pr-46428
git merge upstream/9.1
git push upstream mergify/bp/9.1/pr-46428

@khushijain21
Copy link
Copy Markdown
Contributor

Requires #46781

@khushijain21
Copy link
Copy Markdown
Contributor

Requires #45574

@khushijain21 khushijain21 enabled auto-merge (squash) October 15, 2025 09:03
@khushijain21
Copy link
Copy Markdown
Contributor

khushijain21 commented Oct 16, 2025

the CI failures are unrelated and they are also failing on 8.18 https://buildkite.com/elastic/beats-xpack-agentbeat/builds/21098#0199ecc4-61de-47d3-ac65-d6d4bd655cd7

@pierrehilbert
Copy link
Copy Markdown
Contributor

The failure is coming from: #47159

@pierrehilbert pierrehilbert merged commit 05b1328 into 9.1 Oct 17, 2025
200 of 207 checks passed
@pierrehilbert pierrehilbert deleted the mergify/bp/9.1/pr-46428 branch October 17, 2025 06:25
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.

3 participants