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.10] docs: Clean up OpenTelemetry docs (backport #11882) #11986

Merged
merged 3 commits into from
Nov 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 1, 2023

This is an automatic backport of pull request #11882 done by Mergify.
Cherry-pick of 691b526 has failed:

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

You are currently cherry-picking commit 691b5269e.
  (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:   docs/otel-direct.asciidoc
	modified:   docs/otel-limitations.asciidoc
	modified:   docs/otel-other.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/otel-metrics.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* reduce content on aws lambda support

* update otel links

* clarify env var example

* use lens instead of tsvb

* remove resource attributes link

* apply suggestions from code review

Co-authored-by: Alexander Wert <[email protected]>

---------

Co-authored-by: Alexander Wert <[email protected]>
(cherry picked from commit 691b526)

# Conflicts:
#	docs/otel-metrics.asciidoc
@mergify mergify bot requested a review from a team as a code owner November 1, 2023 15:49
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 1, 2023
@colleenmcginnis
Copy link
Contributor

@elasticmachine, run elasticsearch-ci/docs

@colleenmcginnis
Copy link
Contributor

colleenmcginnis commented Nov 2, 2023

@bmorelli25 I'm having trouble tracking down the error here. Can you please take a look? 👀

Oh gosh it was an unresolved merge conflict. 🙈

@mergify mergify bot merged commit f92fbd3 into 8.10 Nov 3, 2023
@mergify mergify bot deleted the mergify/bp/8.10/pr-11882 branch November 3, 2023 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[REQUEST]: Update OpenTelemetry Collector exporter links
2 participants