Removes statement about CSPM only working in default space (#6911)

benironside · mergify[bot] · commit 48d9f2c904f8 · 2025-07-09T13:24:36.000Z
(cherry picked from commit 86631d5) # 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
diff --git 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
@@ -11,13 +11,18 @@ 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`
 * The user who gives the CSPM integration permissions must be an Azure subscription `admin`.
+=======
+* 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].
+* The user who gives the CSPM integration permissions in Azure must be an Azure subscription `admin`.
+>>>>>>> 86631d53 (Removes statement about CSPM only working in default space (#6911))
 --
 
 [discrete]
diff --git 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
@@ -10,8 +10,20 @@ This feature currently supports Amazon Web Services (AWS) and Google Cloud Platf
 --
 * 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]
