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.16] [ESS & Serverless] Adds OrganizationUnitIDs description to agentless section of AWS CSPM guide (backport #6155) #6195

Merged
merged 3 commits into from
Nov 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 20, 2024

Fixes #5636
Adds OrganizationalUnitIDs field to the agentless CSPM AWS guides, edits the field's description in agent-based method.

Preview: CSPM for AWS (ESS), (Serverless)


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

…section of AWS CSPM guide (#6155)

* Adds OrganizationalUnitIDs field to the agentless CSPM AWS guide, edits language for the field in agent-based method

* Apply suggestions from code review

Co-authored-by: Nastasha Solomon <[email protected]>

---------

Co-authored-by: Nastasha Solomon <[email protected]>
(cherry picked from commit ed8b9bb)

# Conflicts:
#	docs/serverless/cloud-native-security/cspm-get-started.asciidoc
@mergify mergify bot requested a review from a team as a code owner November 20, 2024 19:05
Copy link
Contributor Author

mergify bot commented Nov 20, 2024

Cherry-pick of ed8b9bb has failed:

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

You are currently cherry-picking commit ed8b9bbb.
  (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/cloud-native-security/cspm-get-started-aws.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/serverless/cloud-native-security/cspm-get-started.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

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.

@benironside benironside enabled auto-merge (squash) November 20, 2024 20:24
@benironside benironside merged commit 38515a7 into 8.16 Nov 20, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant