From ae87c6717b61fa970b120db7ecd941ff15800ac6 Mon Sep 17 00:00:00 2001 From: Benjamin Ironside Goldstein <91905639+benironside@users.noreply.github.com> Date: Wed, 9 Jul 2025 09:21:03 -0400 Subject: [PATCH 1/2] Removes statement about CSPM only working in default space (#6911) (cherry picked from commit 86631d53560827b83b08d48bf2c6475405535b13) # Conflicts: # docs/cloud-native-security/cspm-get-started-aws.asciidoc # docs/cloud-native-security/cspm-get-started-azure.asciidoc # docs/cloud-native-security/cspm-get-started-gcp.asciidoc # docs/cloud-native-security/cspm.asciidoc --- .../cspm-get-started-aws.asciidoc | 4 ++++ .../cspm-get-started-azure.asciidoc | 4 ++++ .../cspm-get-started-gcp.asciidoc | 4 ++++ docs/cloud-native-security/cspm.asciidoc | 12 ++++++++++++ 4 files changed, 24 insertions(+) diff --git a/docs/cloud-native-security/cspm-get-started-aws.asciidoc b/docs/cloud-native-security/cspm-get-started-aws.asciidoc index f82a676394..e2dbba8921 100644 --- a/docs/cloud-native-security/cspm-get-started-aws.asciidoc +++ b/docs/cloud-native-security/cspm-get-started-aws.asciidoc @@ -11,12 +11,16 @@ This page explains how to get started monitoring the security posture of your cl [sidebar] -- * The CSPM integration is available to all {ecloud} users. On-premise deployments require an https://www.elastic.co/pricing[Enterprise subscription]. +<<<<<<< HEAD * CSPM only works in the `Default` {kib} space. Installing the CSPM integration on a different {kib} space will not work. * CSPM is supported on commercial cloud only. Government cloud is not supported (https://github.com/elastic/enhancements[request support]). * To view posture data, you need `read` privileges for the following {es} indices: ** `logs-cloud_security_posture.findings_latest-*` ** `logs-cloud_security_posture.scores-*` ** `Logs-cloud_security_posture.findings` +======= +* CSPM is supported only on AWS, GCP, and Azure commercial cloud platforms, and AWS GovCloud. Other government cloud platforms are not supported. https://github.com/elastic/kibana/issues/new/choose[Click here to request support]. +>>>>>>> 86631d53 (Removes statement about CSPM only working in default space (#6911)) * The user who gives the CSPM integration AWS permissions must be an AWS account `admin`. -- diff --git a/docs/cloud-native-security/cspm-get-started-azure.asciidoc b/docs/cloud-native-security/cspm-get-started-azure.asciidoc index 732e2ae8cd..0e55116047 100644 --- a/docs/cloud-native-security/cspm-get-started-azure.asciidoc +++ b/docs/cloud-native-security/cspm-get-started-azure.asciidoc @@ -11,12 +11,16 @@ This page explains how to get started monitoring the security posture of your cl [sidebar] -- * The CSPM integration is available to all {ecloud} users. On-premise deployments require an https://www.elastic.co/pricing[Enterprise subscription]. +<<<<<<< HEAD * CSPM only works in the `Default` {kib} space. Installing the CSPM integration on a different {kib} space will not work. * CSPM is supported on commercial cloud only. Government cloud is not supported (https://github.com/elastic/enhancements[request support]). * To view posture data, you need `read` privileges for the following {es} indices: ** `logs-cloud_security_posture.findings_latest-*` ** `logs-cloud_security_posture.scores-*` ** `logs-cloud_security_posture.findings` +======= +* CSPM is supported only on AWS, GCP, and Azure commercial cloud platforms, and AWS GovCloud. Other government cloud platforms are not supported. https://github.com/elastic/kibana/issues/new/choose[Click here to request support]. +>>>>>>> 86631d53 (Removes statement about CSPM only working in default space (#6911)) * The user who gives the CSPM integration permissions in Azure must be an Azure subscription `admin`. -- diff --git a/docs/cloud-native-security/cspm-get-started-gcp.asciidoc b/docs/cloud-native-security/cspm-get-started-gcp.asciidoc index 479bb844fb..1cdf7cbd1b 100644 --- a/docs/cloud-native-security/cspm-get-started-gcp.asciidoc +++ b/docs/cloud-native-security/cspm-get-started-gcp.asciidoc @@ -11,12 +11,16 @@ This page explains how to get started monitoring the security posture of your GC [sidebar] -- * The CSPM integration is available to all {ecloud} users. On-premise deployments require an https://www.elastic.co/pricing[Enterprise subscription]. +<<<<<<< HEAD * CSPM only works in the `Default` {kib} space. Installing the CSPM integration on a different {kib} space will not work. * CSPM is supported on commercial cloud only. Government cloud is not supported (https://github.com/elastic/enhancements[request support]). * To view posture data, you need `read` privileges for the following {es} indices: ** `logs-cloud_security_posture.findings_latest-*` ** `logs-cloud_security_posture.scores-*` ** `Logs-cloud_security_posture.findings` +======= +* CSPM is supported only on AWS, GCP, and Azure commercial cloud platforms, and AWS GovCloud. Other government cloud platforms are not supported. https://github.com/elastic/kibana/issues/new/choose[Click here to request support]. +>>>>>>> 86631d53 (Removes statement about CSPM only working in default space (#6911)) * The user who gives the CSPM integration GCP permissions must be a GCP project `admin`. -- diff --git a/docs/cloud-native-security/cspm.asciidoc b/docs/cloud-native-security/cspm.asciidoc index ff6c0989c7..1c665198c4 100644 --- a/docs/cloud-native-security/cspm.asciidoc +++ b/docs/cloud-native-security/cspm.asciidoc @@ -10,8 +10,20 @@ This feature currently supports Amazon Web Services (AWS), Google Cloud Platform -- * CSPM is available to all {ecloud} users. On-premise deployments require an https://www.elastic.co/pricing[Enterprise subscription]. * {stack} version 8.10 or greater. +<<<<<<< HEAD * CSPM only works in the `Default` {kib} space. Installing the CSPM integration on a different {kib} space will not work. * CSPM is supported on commercial cloud only. Government cloud is not supported (https://github.com/elastic/enhancements[request support]). +======= +* CSPM is supported only on AWS, GCP, and Azure commercial cloud platforms, and AWS GovCloud. Other government cloud platforms are not supported. https://github.com/elastic/kibana/issues/new/choose[Click here to request support]. +* `Read` privileges for the following {es} indices: +** `logs-cloud_security_posture.findings_latest-*` +** `logs-cloud_security_posture.scores-*` +* The following {kib} privileges: +** Security: `Read` +** Integrations: `Read` +** Saved Objects Management: `Read` +** Fleet: `All` +>>>>>>> 86631d53 (Removes statement about CSPM only working in default space (#6911)) -- [discrete] From b5679e3951fd900693489bcac1385c78ff17799d Mon Sep 17 00:00:00 2001 From: Benjamin Ironside Goldstein Date: Thu, 10 Jul 2025 13:19:24 -0400 Subject: [PATCH 2/2] fix merge conflicts --- docs/cloud-native-security/cspm-get-started-aws.asciidoc | 5 ----- docs/cloud-native-security/cspm-get-started-azure.asciidoc | 5 ----- docs/cloud-native-security/cspm-get-started-gcp.asciidoc | 5 ----- docs/cloud-native-security/cspm.asciidoc | 5 ----- 4 files changed, 20 deletions(-) diff --git a/docs/cloud-native-security/cspm-get-started-aws.asciidoc b/docs/cloud-native-security/cspm-get-started-aws.asciidoc index e2dbba8921..43c3aba75f 100644 --- a/docs/cloud-native-security/cspm-get-started-aws.asciidoc +++ b/docs/cloud-native-security/cspm-get-started-aws.asciidoc @@ -11,16 +11,11 @@ This page explains how to get started monitoring the security posture of your cl [sidebar] -- * The CSPM integration is available to all {ecloud} users. On-premise deployments require an https://www.elastic.co/pricing[Enterprise subscription]. -<<<<<<< HEAD -* CSPM only works in the `Default` {kib} space. Installing the CSPM integration on a different {kib} space will not work. * CSPM is supported on commercial cloud only. Government cloud is not supported (https://github.com/elastic/enhancements[request support]). * To view posture data, you need `read` privileges for the following {es} indices: ** `logs-cloud_security_posture.findings_latest-*` ** `logs-cloud_security_posture.scores-*` ** `Logs-cloud_security_posture.findings` -======= -* CSPM is supported only on AWS, GCP, and Azure commercial cloud platforms, and AWS GovCloud. Other government cloud platforms are not supported. https://github.com/elastic/kibana/issues/new/choose[Click here to request support]. ->>>>>>> 86631d53 (Removes statement about CSPM only working in default space (#6911)) * The user who gives the CSPM integration AWS permissions must be an AWS account `admin`. -- diff --git a/docs/cloud-native-security/cspm-get-started-azure.asciidoc b/docs/cloud-native-security/cspm-get-started-azure.asciidoc index 0e55116047..73014a4b8e 100644 --- a/docs/cloud-native-security/cspm-get-started-azure.asciidoc +++ b/docs/cloud-native-security/cspm-get-started-azure.asciidoc @@ -11,16 +11,11 @@ This page explains how to get started monitoring the security posture of your cl [sidebar] -- * The CSPM integration is available to all {ecloud} users. On-premise deployments require an https://www.elastic.co/pricing[Enterprise subscription]. -<<<<<<< HEAD -* CSPM only works in the `Default` {kib} space. Installing the CSPM integration on a different {kib} space will not work. * CSPM is supported on commercial cloud only. Government cloud is not supported (https://github.com/elastic/enhancements[request support]). * To view posture data, you need `read` privileges for the following {es} indices: ** `logs-cloud_security_posture.findings_latest-*` ** `logs-cloud_security_posture.scores-*` ** `logs-cloud_security_posture.findings` -======= -* CSPM is supported only on AWS, GCP, and Azure commercial cloud platforms, and AWS GovCloud. Other government cloud platforms are not supported. https://github.com/elastic/kibana/issues/new/choose[Click here to request support]. ->>>>>>> 86631d53 (Removes statement about CSPM only working in default space (#6911)) * The user who gives the CSPM integration permissions in Azure must be an Azure subscription `admin`. -- diff --git a/docs/cloud-native-security/cspm-get-started-gcp.asciidoc b/docs/cloud-native-security/cspm-get-started-gcp.asciidoc index 1cdf7cbd1b..aaf1f70067 100644 --- a/docs/cloud-native-security/cspm-get-started-gcp.asciidoc +++ b/docs/cloud-native-security/cspm-get-started-gcp.asciidoc @@ -11,16 +11,11 @@ This page explains how to get started monitoring the security posture of your GC [sidebar] -- * The CSPM integration is available to all {ecloud} users. On-premise deployments require an https://www.elastic.co/pricing[Enterprise subscription]. -<<<<<<< HEAD -* CSPM only works in the `Default` {kib} space. Installing the CSPM integration on a different {kib} space will not work. * CSPM is supported on commercial cloud only. Government cloud is not supported (https://github.com/elastic/enhancements[request support]). * To view posture data, you need `read` privileges for the following {es} indices: ** `logs-cloud_security_posture.findings_latest-*` ** `logs-cloud_security_posture.scores-*` ** `Logs-cloud_security_posture.findings` -======= -* CSPM is supported only on AWS, GCP, and Azure commercial cloud platforms, and AWS GovCloud. Other government cloud platforms are not supported. https://github.com/elastic/kibana/issues/new/choose[Click here to request support]. ->>>>>>> 86631d53 (Removes statement about CSPM only working in default space (#6911)) * The user who gives the CSPM integration GCP permissions must be a GCP project `admin`. -- diff --git a/docs/cloud-native-security/cspm.asciidoc b/docs/cloud-native-security/cspm.asciidoc index 1c665198c4..d159b86a8a 100644 --- a/docs/cloud-native-security/cspm.asciidoc +++ b/docs/cloud-native-security/cspm.asciidoc @@ -10,11 +10,7 @@ This feature currently supports Amazon Web Services (AWS), Google Cloud Platform -- * CSPM is available to all {ecloud} users. On-premise deployments require an https://www.elastic.co/pricing[Enterprise subscription]. * {stack} version 8.10 or greater. -<<<<<<< HEAD -* CSPM only works in the `Default` {kib} space. Installing the CSPM integration on a different {kib} space will not work. * CSPM is supported on commercial cloud only. Government cloud is not supported (https://github.com/elastic/enhancements[request support]). -======= -* CSPM is supported only on AWS, GCP, and Azure commercial cloud platforms, and AWS GovCloud. Other government cloud platforms are not supported. https://github.com/elastic/kibana/issues/new/choose[Click here to request support]. * `Read` privileges for the following {es} indices: ** `logs-cloud_security_posture.findings_latest-*` ** `logs-cloud_security_posture.scores-*` @@ -23,7 +19,6 @@ This feature currently supports Amazon Web Services (AWS), Google Cloud Platform ** Integrations: `Read` ** Saved Objects Management: `Read` ** Fleet: `All` ->>>>>>> 86631d53 (Removes statement about CSPM only working in default space (#6911)) -- [discrete]