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.18](backport) Manual backport missing from previous PR #4831

Merged
merged 1 commit into from
Mar 7, 2025

Conversation

ericywl
Copy link
Contributor

@ericywl ericywl commented Feb 28, 2025

Description

Add missing backports for previous PR: #4825

Documentation sets edited in this PR

Check all that apply.

  • Stateful (docs/en/observability/*)
  • Serverless (docs/en/serverless/*)
  • Integrations Developer Guide (docs/en/integrations/*)
  • None of the above

Checklist

  • Product/Engineering Review
  • Writer Review

Follow-up tasks

Select one.

  • This PR does not need to be ported to another doc set because:
    • The concepts in this PR only apply to one doc set (serverless or stateful)
    • The PR contains edits to both doc sets (serverless and stateful)
  • This PR needs to be ported to another doc set:
    • Port to stateful docs: <link to PR or tracking issue>
    • Port to serverless docs: <link to PR or tracking issue>

@ericywl ericywl added backport-8.13 Automated backport with mergify backport-8.14 Automated backport with mergify backport-8.15 Automated backport with mergify backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify labels Feb 28, 2025
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.

@ericywl ericywl marked this pull request as ready for review February 28, 2025 10:01
@ericywl ericywl requested a review from a team as a code owner February 28, 2025 10:01
@ericywl
Copy link
Contributor Author

ericywl commented Feb 28, 2025

Hi, I'm unsure if I'm doing this correctly. The previous PR was missing some backport labels.

@bmorelli25 bmorelli25 merged commit e2cf3fd into 8.18 Mar 7, 2025
21 checks passed
@bmorelli25 bmorelli25 deleted the add-note-on-apm-server-personal-data branch March 7, 2025 17:36
mergify bot pushed a commit that referenced this pull request Mar 7, 2025
(cherry picked from commit e2cf3fd)

# Conflicts:
#	docs/en/observability/apm/security/data-security/filtering.asciidoc
mergify bot pushed a commit that referenced this pull request Mar 7, 2025
(cherry picked from commit e2cf3fd)

# Conflicts:
#	docs/en/observability/apm/security/data-security/filtering.asciidoc
mergify bot pushed a commit that referenced this pull request Mar 7, 2025
(cherry picked from commit e2cf3fd)

# Conflicts:
#	docs/en/observability/apm/security/data-security/filtering.asciidoc
mergify bot pushed a commit that referenced this pull request Mar 7, 2025
mergify bot pushed a commit that referenced this pull request Mar 7, 2025
ericywl added a commit that referenced this pull request Mar 10, 2025
(cherry picked from commit e2cf3fd)

Co-authored-by: Eric <22215921+ericywl@users.noreply.github.com>
ericywl added a commit that referenced this pull request Mar 10, 2025
(cherry picked from commit e2cf3fd)

Co-authored-by: Eric <22215921+ericywl@users.noreply.github.com>
ericywl added a commit that referenced this pull request Mar 10, 2025
…previous PR (#4838)

* Backport 8.18 because missing (#4831)

(cherry picked from commit e2cf3fd)

# Conflicts:
#	docs/en/observability/apm/security/data-security/filtering.asciidoc

* Fix conflicts

---------

Co-authored-by: Eric <22215921+ericywl@users.noreply.github.com>
Co-authored-by: Eric Yap <eric.yap@elastic.co>
ericywl added a commit that referenced this pull request Mar 10, 2025
…previous PR (#4839)

* Backport 8.18 because missing (#4831)

(cherry picked from commit e2cf3fd)

# Conflicts:
#	docs/en/observability/apm/security/data-security/filtering.asciidoc

* Fix conflicts

---------

Co-authored-by: Eric <22215921+ericywl@users.noreply.github.com>
Co-authored-by: Eric Yap <eric.yap@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.13 Automated backport with mergify backport-8.14 Automated backport with mergify backport-8.15 Automated backport with mergify backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants