Skip to content
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

[8.14](backport #4707) Make elasticsearchexporter available in Agent running in OTel mode #4711

Merged
merged 3 commits into from
May 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 8, 2024

What does this PR do?

This PR makes the elasticsearch exporter available to users running Elastic Agent in otel mode.

Why is it important?

To allow users of Elastic Agent running as as OpenTelemetry Collector to configure pipelines containing the elasticsearchexporter.

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/fragments using the changelog tool
  • I have added an integration test or an E2E test

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

@mergify mergify bot requested a review from a team as a code owner May 8, 2024 16:34
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 8, 2024
@mergify mergify bot requested review from michalpristas and andrzej-stencel and removed request for a team May 8, 2024 16:34
Copy link
Contributor Author

mergify bot commented May 8, 2024

Cherry-pick of a045482 has failed:

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

You are currently cherry-picking commit a045482d51.
  (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
	new file:   changelog/fragments/1715178161-otel-mode-add-elasticsearch-exporter.yaml
	modified:   internal/pkg/otel/components.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md

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

@ycombinator
Copy link
Contributor

Waiting on #4714 to be merged before rebasing this PR on 8.14.

Copy link
Contributor Author

mergify bot commented May 8, 2024

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.14/pr-4707 upstream/mergify/bp/8.14/pr-4707
git merge upstream/8.14
git push upstream mergify/bp/8.14/pr-4707

…4707)

* Make elasticsearch exporter available in Agent running in OTel mode

* Reordering dependencies

* Regenerating README

* Adding CHANGELOG entry

(cherry picked from commit a045482)
@ycombinator ycombinator force-pushed the mergify/bp/8.14/pr-4707 branch from f8b1b92 to 1df51cf Compare May 8, 2024 20:58
@ycombinator ycombinator enabled auto-merge (squash) May 8, 2024 21:04
@ycombinator ycombinator merged commit dd560fc into 8.14 May 8, 2024
9 checks passed
@ycombinator ycombinator deleted the mergify/bp/8.14/pr-4707 branch May 8, 2024 22:32
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant