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.

Sign up for GitHub

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

Jump to bottom

[8.12](backport #4147) Add tags to fix chunking in obs guide #4152

Merged
merged 3 commits into from
Aug 14, 2024
Merged

[8.12](backport #4147) Add tags to fix chunking in obs guide #4152

merged 3 commits into from
Aug 14, 2024

Commits on Aug 14, 2024

  1. Add tags to fix chunking in obs guide (#4147) 

    * 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/configure/outputs/elasticsearch.asciidoc
#	docs/en/observability/apm/configure/outputs/kafka.asciidoc
#	docs/en/observability/apm/configure/outputs/logstash.asciidoc
#	docs/en/observability/apm/configure/outputs/redis.asciidoc
#	docs/en/observability/apm/sampling.asciidoc
    @dedemorton @mergify
    dedemorton authored and mergify[bot] committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    4554814 View commit details
    Browse the repository at this point in the history

  2. Resolve conflicts

    @dedemorton
    dedemorton committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    8c44da9 View commit details
    Browse the repository at this point in the history

  3. 2nd pass

    @dedemorton
    dedemorton committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    a1cdd19 View commit details
    Browse the repository at this point in the history