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.13](backport #4147) Add tags to fix chunking in obs guide #4153

Merged
merged 2 commits into from
Aug 14, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 14, 2024

Clean up float tags in advance of bumpting the chunk level to 4.

required before merging elastic/docs#3045.


This is an automatic backport of pull request #4147 done by Mergify.

* Fix chunking

* update some leveloffsets

---------

Co-authored-by: Colleen McGinnis <[email protected]>
(cherry picked from commit 048c755)

# Conflicts:
#	docs/en/observability/apm-ui/api.asciidoc
#	docs/en/observability/apm/sampling.asciidoc
@mergify mergify bot requested a review from a team as a code owner August 14, 2024 16:45
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 14, 2024
Copy link
Contributor Author

mergify bot commented Aug 14, 2024

Cherry-pick of 048c755 has failed:

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

You are currently cherry-picking commit 048c755d.
  (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/en/observability/apm/configure/outputs/console.asciidoc
	modified:   docs/en/observability/apm/configure/outputs/elasticsearch.asciidoc
	modified:   docs/en/observability/apm/configure/outputs/kafka.asciidoc
	modified:   docs/en/observability/apm/configure/outputs/logstash.asciidoc
	modified:   docs/en/observability/apm/configure/outputs/output-cloud.asciidoc
	modified:   docs/en/observability/apm/configure/outputs/redis.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/en/observability/apm-ui/api.asciidoc
	both modified:   docs/en/observability/apm/sampling.asciidoc

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

Copy link
Contributor

A documentation preview will be available soon.

Request a new doc build by commenting
  • Rebuild this PR: run docs-build
  • Rebuild this PR and all Elastic docs: run docs-build rebuild

run docs-build is much faster than run docs-build rebuild. A rebuild should only be needed in rare situations.

If your PR continues to fail for an unknown reason, the doc build pipeline may be broken. Elastic employees can check the pipeline status here.

@dedemorton dedemorton enabled auto-merge (squash) August 14, 2024 16:59
@dedemorton dedemorton removed the conflicts There is a conflict in the backported pull request label Aug 14, 2024
@dedemorton dedemorton merged commit e878b6c into 8.13 Aug 14, 2024
4 checks passed
@dedemorton dedemorton deleted the mergify/bp/8.13/pr-4147 branch August 14, 2024 17:21
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.

1 participant