DOCS-9855: CSM resource collection updates

content/en/security/cloud_security_management/setup/cloud_integrations.md

@@ -37,62 +37,38 @@ To enable resource scanning for your cloud accounts, you must first set up the i
 
 ## Disable resource scanning
 
-To disable resource scanning for your cloud accounts, navigate to either the [**CSM Setup**][1] page or the cloud account integration page. Disabling resource scanning does not affect your ability to access historical findings. You can still review data from the past 15 months.
+<div class="alert alert-info">You can access historical findings from the past 15 months even if resource scanning is disabled.</div>
 
 {{< tabs >}}
 {{% tab "AWS" %}}
 
-### CSM Setup page
-
 1. On the [**Cloud Security Management Setup**][1] page, click **Cloud Integrations**.
 1. Expand the **AWS** section.
-1. To stop resource collection for an account, click the Edit button and switch the **Enable Resource Scanning** toggle to the off position.
+1. To stop resource collection for an account, click the **Edit** button ({{< img src="security/csm/setup/edit-button.png" inline="true" style="width:24px;">}}) and switch the **Enable Resource Scanning** toggle to the off position.
 1. Click **Done**.
 
-### Amazon Web Services integration page
-
-1. On the [**Amazon Web Services Integration**][2] page, select an AWS account.
-1. On the **Resource Collection** tab, clear the **Enable Cloud Security Management** checkbox.
-1. Click Save.
-
 [1]: https://app.datadoghq.com/security/configuration/csm/setup
 [2]: https://app.datadoghq.com/integrations/amazon-web-services
 
 {{% /tab %}}
 {{% tab "Azure" %}}
 
-### CSM Setup page
-
 1. On the [**Cloud Security Management Setup**][1] page, click **Cloud Integrations**.
 1. Expand the **Azure** section.
 1. To stop resource collection for a subscription, switch the **Resource Scanning** toggle to the off position.
 1. Click **Done**.
 
-### Azure integration page
-
-1. On the [**Azure Integration**][2] page, select an app registration.
-1. On the **Resource Collection** tab, clear the **Enable Cloud Security Management** checkbox.
-1. Click Save.
-
 [1]: https://app.datadoghq.com/security/configuration/csm/setup
 [2]: https://app.datadoghq.com/integrations/azure
 
 {{% /tab %}}
 {{% tab "Google Cloud" %}}
 
-### CSM Setup page
-
 1. On the [**Cloud Security Management Setup**][1] page, click **Cloud Integrations**.
 1. Expand the **GCP** section.
 1. To stop resource collection for a project, switch the **Resource Scanning** toggle to the off position.
 1. Click **Done**.
 
-### Google Cloud Platform integration page
-
-1. On the [**Google Cloud Platform Integration**][2] page, select a Google Cloud account.
-1. On the **Resource Collection** tab, clear the **Enable Cloud Security Management** checkbox.
-1. Click **Save**.
-
 [1]: https://app.datadoghq.com/security/configuration/csm/setup
 [2]: https://app.datadoghq.com/integrations/google-cloud-platform
 

content/en/security/cloud_security_management/setup/without_infrastructure_monitoring.md

@@ -2,7 +2,7 @@
 title: Setting Up CSM without Infrastructure Monitoring
 ---
 
-In addition to setting up CSM with or without an Agent, you can also set it up without Infrastructure Monitoring.
+In addition to setting up Cloud Security Management (CSM) with or without an Agent, you can also set it up without Infrastructure Monitoring.
 
 ## Set up CSM on your AWS account
 
@@ -11,8 +11,9 @@ In addition to setting up CSM with or without an Agent, you can also set it up w
 
    If you don't see the required account, add it by clicking **Add AWS Account(s)** and following the onscreen prompts.
 1. To turn off infrastructure monitoring on the selected account, under the account number, navigate to the **Metric Collection** tab, then click the **disable metric collection** link. Then, click **Disable Metric Collection** to confirm.
-1. To turn on CSM, on the **Resource Collection** tab, turn on the **Enable Resource Collection** toggle, and select the **Enable Cloud Security Management** checkbox.
-1. Click **Save**.
+1. On the **Resource Collection** tab, click **Enable** next to Cloud Security Management. You are redirected to the Cloud Security Management Setup page, and a setup dialog automatically opens for the selected account.
+1. On the setup dialog, switch the **Enable Resource Scanning** toggle to the on position.
+1. Click **Done** to complete the setup.
 
 **Note**: In your CSM settings, set up [resource evaluation filters][1] to limit the number of hosts you need security on.
 
@@ -23,8 +24,9 @@ In addition to setting up CSM with or without an Agent, you can also set it up w
 
    If you don't see the required client ID, add it by clicking **Add New App Registration** and following the onscreen prompts.
 1. To turn off infrastructure monitoring on the selected account, under the client ID, navigate to the **Metric Collection** tab, then turn off the **Enable Metric Collection** toggle. 
-1. To turn on CSM, on the **Resource Collection** tab, turn on the **Enable Resource Collection** toggle, and select the **Enable Cloud Security Management** checkbox.
-1. Click **Save**.
+1. On the **Resource Collection** tab, click **Enable** next to Cloud Security Management. You are redirected to the Cloud Security Management Setup page, which automatically scrolls to the selected Azure subscription in the Cloud Integrations section.
+1. Switch the **Resource Scanning** toggle to the on position.
+1. Click **Done** to complete the setup.
 
 **Note**: In your CSM settings, set up [resource evaluation filters][1] to limit the number of hosts you need security on.
 
@@ -35,8 +37,9 @@ In addition to setting up CSM with or without an Agent, you can also set it up w
 
    If you don't see the required account, add it by clicking **Add GCP Account** and following the onscreen prompts.
 1. To turn off infrastructure monitoring on the selected account, under the account name, navigate to the **Metric Collection** tab. Then, above the Metric Collection table, click **Disable All**.
-1. To turn on CSM, on the **Resource Collection** tab, turn on the **Enable Resource Collection** toggle, and select the **Enable Cloud Security Management** checkbox.
-1. Click **Save**.
+1. On the **Resource Collection** tab, click **Enable** next to Cloud Security Management. You are redirected to the Cloud Security Management Setup page, which automatically scrolls to the selected Google Cloud Platform project in the Cloud Integrations section.
+1. Switch the **Resource Scanning** toggle to the on position.
+1. Click **Done** to complete the setup.
 
 **Note**: In your CSM settings, set up [resource evaluation filters][1] to limit the number of hosts you need security on.
 

layouts/shortcodes/csm-setup-aws.en.md

@@ -1,28 +1,18 @@
 ### Set up the Datadog AWS integration
 
-If you haven't already, set up the [Amazon Web Services integration][1]. You must also add the [required permissions][2] for resource collection.
+If you haven't already, set up the [Amazon Web Services integration][1]. You must also [enable resource collection][2] by attaching the AWS-managed SecurityAudit Policy to the Datadog IAM role in your AWS account.
 
 ### Enable CSM for your AWS accounts
 
-Use one of the following methods to enable CSM for your AWS accounts:
-
-#### CSM Setup page
-
 1. On the [**Cloud Security Management Setup**][3] page, click **Cloud Integrations**.
 1. Expand the **AWS** section.
 1. To enable resource scanning for an account, click the **Plus** button, then switch the **Enable Resource Scanning** toggle to the on position.
 1. Click **Done**.
 1. To create a filter that excludes certain resources from being evaluated by CSM, click the **Plus** (+) icon under **Resource Evaluation Filters (Optional)**. For more information, see [Use Filters to Exclude Resources from Evaluation][5].
 1. Click **Done**.
 
-#### Amazon Web Services integration page
-
-1. On the [**Amazon Web Services Integration**][4] page, select an AWS account.
-1. On the **Resource Collection** tab, select **Enable Cloud Security Management**.
-1. Click **Save**.
-
 [1]: https://docs.datadoghq.com/integrations/amazon_web_services/
-[2]: /integrations/amazon_web_services/?tab=roledelegation#cloud-security-management-misconfigurations
+[2]: /integrations/amazon_web_services/?tab=roledelegation#cloud-security-management
 [3]: https://app.datadoghq.com/security/configuration/csm/setup
 [4]: https://app.datadoghq.com/integrations/amazon-web-services
 [5]: /security/cloud_security_management/guide/resource_evaluation_filters

layouts/shortcodes/csm-setup-azure.en.md

@@ -6,22 +6,12 @@ If you haven't already, set up the [Microsoft Azure integration][1].
 
 ### Enable CSM for your Azure subscriptions
 
-Use one of the following methods to enable CSM for your Azure subscriptions:
-
-#### CSM Setup page
-
 1. On the [**Cloud Security Management Setup**][2] page, click **Cloud Integrations**.
 2. Expand the **Azure** section.
 3. To enable resource scanning for a subscription, switch the **Resource Scanning** toggle to the on position.
 4. To create a filter that excludes certain resources from being evaluated by CSM, click the **Plus** (+) icon under **Resource Evaluation Filters (Optional)**. For more information, see [Use Filters to Exclude Resources from Evaluation][4].
 5. Click **Done**.
 
-#### Azure integration page
-
-1. On the [**Azure Integration**][3] page, select an Azure app registration.
-2. Under **Resource Collection**, select **Enable Cloud Security Management**.
-3. Click **Submit Changes**.
-
 [1]: https://docs.datadoghq.com/integrations/azure
 [2]: https://app.datadoghq.com/security/configuration/csm/setup
 [3]: https://app.datadoghq.com/integrations/azure

layouts/shortcodes/csm-setup-google-cloud.en.md

@@ -15,22 +15,12 @@ The Datadog Google Cloud Platform integration uses service accounts to create an
 
 ### Enable CSM for your Google Cloud projects
 
-Use one of the following methods to enable CSM for your Google Cloud projects:
-
-#### CSM Setup page
-
 1. On the [**Cloud Security Management Setup**][2] page, click **Cloud Integrations**.
 2. Expand the **GCP** section.
 3. To enable resource scanning for a project, switch the **Resource Scanning** toggle to the on position.
 4. To create a filter that excludes certain resources from being evaluated by CSM, click the **Plus** (+) icon under **Resource Evaluation Filters (Optional)**. For more information, see [Use Filters to Exclude Resources from Evaluation][11].
 5. Click **Done**.
 
-#### Google Cloud Platform integration page
-
-1. On the [**Google Cloud Platform Integration**][10] page, select a Google Cloud project.
-2. Under **Resource Collection**, select **Enable Cloud Security Management**.
-3. Click **Save**.
-
 [1]: https://docs.datadoghq.com/integrations/google_cloud_platform
 [2]: https://app.datadoghq.com/security/configuration/csm/setup
 [4]: https://support.google.com/cloud/answer/6293499?hl=en