Repository: DataDog/documentation
Pull request #29465: [CCM] Update AWS Setup documentation to support CloudFormation mode
Author: login: hinosxz
Labels: name: Images
description: Images are added/removed with this PR
name: mergequeue-status: done
Created: 2025-05-21T16:38:20Z | Merged: 2025-05-22T14:19:21Z

### What does this PR do? What is the motivation?

Cloud Cost Management is releasing a simplified version of its AWS setup based on AWS CloudFormation. This PR is updating the public documentation to reflect that change and help guide users to set up the product as fast as possible.

### Merge instructions

<!-- 
If you're waiting for a release or there are other considerations that you want us to be aware of, list them here. 
If the PR is ready to be merged once it receives the required reviews, check the box below after you've created the PR.
-->

Merge readiness:
- [ ] Ready for merge

**For Datadog employees**:
Merge queue is enabled in this repo. Your branch name MUST follow the `<name>/<description>` convention and include the forward slash (`/`). Without this format, your pull request will not pass in CI, the GitLab pipeline will not run, and you won't get a branch preview. Getting a branch preview makes it easier for us to check any issues with your PR, such as broken links.

If your branch doesn't follow this format, rename it or create a new branch and PR.

To have your PR automatically merged after it receives the required reviews, add the following PR comment:

```
/merge
```

### Additional notes
<!-- Anything else we should know when reviewing?-->

<!-- Previewing the PR: Assuming you are a Datadog employee and named your branch `<yourname>/<description>`, a preview build will run and links to the preview output will be auto-generated and posted in the PR comments. The links will 404 until the preview build is finished running. -->



Diff:
diff --git a/content/en/cloud_cost_management/setup/aws.md b/content/en/cloud_cost_management/setup/aws.md
index e2733631fab..93141fce8d2 100644
--- a/content/en/cloud_cost_management/setup/aws.md
+++ b/content/en/cloud_cost_management/setup/aws.md
@@ -25,9 +25,54 @@ To set up Cloud Cost Management in Datadog, you should:
 
 ## Setup
 
+### Configure the AWS integration
+
+Navigate to [Setup & Configuration][7] and select an AWS account from the dropdown menu to pull costs from.
+
+**Note**: Datadog recommends sending a Cost and Usage Report from an [AWS **management account**][2] for cost visibility into related **member accounts**. If you send a Cost and Usage report from an AWS **member account**, ensure that you have selected the following options in your **management account's** [preferences][3]:
+
+* **Linked Account Access**
+* **Linked Account Refunds and Credits**
+* **Linked Account Discounts**
+
+This ensures complete cost accuracy by allowing periodic cost calculations against the AWS Cost Explorer.
+
+{{< tabs >}}
+
+{{% tab "CloudFormation" %}}
+
+{{< img src="cloud_cost/setup/aws_cloudformation_setup.jpg" alt="Cloud Cost Management setup form in CloudFormation mode" style="width:100%" >}}
+
+### Select the resources to create
+
+The CloudFormation stack can be configured in three ways depending on your existing AWS resources:
+
+* **New setup**: Select **Create Cost and Usage Report** to create both the report and its S3 bucket
+* **Existing bucket**: Select **Create Cost and Usage Report** and unselect **Create S3 Bucket** to use an existing S3 bucket
+* **Existing report**: Unselect **Create Cost and Usage Report** to import an existing Cost and Usage Report
+
+### Configure the Cost and Usage Report settings
+
+Enter the following details for your Cost and Usage Report:
+
+* **Bucket Name**: The S3 bucket name where the report files are stored.
+* **Bucket Region**: The AWS [region code][100] of the region containing your S3 bucket. For example, `us-east-1`.
+* **Export Path Prefix**: The S3 path prefix where report files are stored.
+* **Export Name**: The name of your Cost and Usage Report.
+
+**Note**: These values either locate your existing Cost and Usage Report, or define the settings for newly created resources.
+
+[100]: https://docs.aws.amazon.com/global-infrastructure/latest/regions/aws-regions.html
+
+{{% /tab %}}
+
+{{% tab "Manual" %}}
+
+{{< img src="cloud_cost/setup/aws_manual_setup.jpg" alt="Cloud Cost Management setup form in manual mode" style="width:100%" >}}
+
 ### Prerequisite: generate a Cost and Usage Report
 
-[Create a Legacy Cost and Usage Report][1] in AWS under the **Data Exports** section.
+[Create a Legacy Cost and Usage Report][201] in AWS under the **Data Exports** section.
 
 Select the Export type **Legacy CUR export**.
 
@@ -35,7 +80,7 @@ Select the following content options:
 
 * Export type: **Legacy CUR export**
 * **Include resource IDs**
-* **Split cost allocation data** (Enables ECS Cost Allocation. You must also opt in to [AWS Split Cost Allocation][10] in Cost Explorer preferences).
+* **Split cost allocation data** (Enables ECS Cost Allocation. You must also opt in to [AWS Split Cost Allocation][210] in Cost Explorer preferences).
 * **"Refresh automatically"**
 
 Select the following delivery options:
@@ -44,21 +89,9 @@ Select the following delivery options:
 * Report versioning: **Create new report version**
 * Compression type: **GZIP** or **Parquet**
 
-### Configure the AWS integration
-
-Navigate to [Setup & Configuration][7] and select an AWS account from the dropdown menu to pull costs from.
-
-**Note**: Datadog recommends sending a Cost and Usage Report from an [AWS **management account**][2] for cost visibility into related **member accounts**. If you send a Cost and Usage report from an AWS **member account**, ensure that you have selected the following options in your **management account's** [preferences][3]:
-
-* **Linked Account Access**
-* **Linked Account Refunds and Credits**
-* **Linked Account Discounts**
-
-This ensures complete cost accuracy by allowing periodic cost calculations against the AWS Cost Explorer.
-
 ### Locate the Cost and Usage Report
 
-If you have navigated away from the report that you created in the prerequisites section, follow AWS documentation to [view your Data Exports][4]. Select the legacy CUR export that you created, then select **Edit** to see the details of the export.
+If you have navigated away from the report that you created in the prerequisites section, follow AWS documentation to [view your Data Exports][204]. Select the legacy CUR export that you created, then select **Edit** to see the details of the export.
 
 To enable Datadog to locate the Cost and Usage Report, complete the fields with their corresponding details:
 
@@ -75,7 +108,7 @@ To enable Datadog to locate the Cost and Usage Report, complete the fields with
 
 ### Configure access to the Cost and Usage Report
 
-[Create a policy][5] in AWS to ensure Datadog has permissions to access the CUR and the S3 bucket it is stored in. Use the following JSON:
+[Create a policy][205] in AWS to ensure Datadog has permissions to access the CUR and the S3 bucket it is stored in. Use the following JSON:
 
 {{< code-block lang="yaml" collapsible="true" >}}
 {
@@ -140,27 +173,26 @@ Attach the new S3 policy to the Datadog integration role.
 
 **Note:** Data can take up to 48 to 72 hours after setup to stabilize in Datadog.
 
-### Account filtering
+[201]: https://docs.aws.amazon.com/cur/latest/userguide/dataexports-create-legacy.html
+[204]: https://docs.aws.amazon.com/cur/latest/userguide/dataexports-view.html
+[205]: https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_create-console.html
+[210]: https://docs.aws.amazon.com/cur/latest/userguide/enabling-split-cost-allocation-data.html
 
-Use Account Filtering to control which AWS member accounts to pull into Cloud Cost Management. You do not incur any additional costs for accounts that you filter out.
+{{% /tab %}}
 
-Using Account Filtering requires an AWS management account. You can configure account filters during setup and after an account has been configured in Cloud Cost Management.
+{{< /tabs >}}
 
-**Note:** Account filters are not supported for Recommendations or tag search.
-
-#### Configure account filters for a new account
-
-Navigate to [**Cloud Cost** > **Settings**, select **Accounts**][18], and then click **Add Account** on the AWS account card.
+### Account filtering
 
-{{< img src="cloud_cost/account_filtering/add_account.png" alt="Add Account button on account card" style="width:100%;" >}}
+Use Account Filtering to control which AWS member accounts to pull into Cloud Cost Management. You do not incur any additional costs for accounts that you filter out.
 
-You can configure account filters in step 4 of the setup process.
+Using Account Filtering requires an AWS management account. You can configure account filters after an account has been configured in Cloud Cost Management.
 
-{{< img src="cloud_cost/account_filtering/account_filtering_setup.png" alt="Account Filtering UI to filter AWS member accounts during setup" style="width:100%;" >}}
+**Note:** Account filters are not supported for Recommendations or tag search.
 
 #### Configure account filters for an existing account
 
-Navigate to [**Cloud Cost** > **Settings**, select **Accounts**][18], and then click **Manage Account** for the management account you want to filter.
+Navigate to [**Cloud Cost** > **Settings**, select **Accounts**][17], and then click **Manage Account** for the management account you want to filter.
 
 {{< img src="cloud_cost/account_filtering/manage_account.png" alt="Manage Account button on account card" style="width:100%;" >}}
 
@@ -404,4 +436,4 @@ After the billing conductor CUR is created, follow the Cloud Cost Management ins
 [14]: https://docs.aws.amazon.com/organizations/latest/userguide/orgs_tagging.html
 [15]: /cloud_cost_management/tag_pipelines
 [16]: https://docs.aws.amazon.com/billingconductor/latest/userguide/what-is-billingconductor.html
-[18]: https://app.datadoghq.com/cost/settings/accounts
+[17]: https://app.datadoghq.com/cost/settings/accounts
diff --git a/static/images/cloud_cost/account_filtering/account_filtering_setup.png b/static/images/cloud_cost/account_filtering/account_filtering_setup.png
deleted file mode 100644
index 3195a6acb59..00000000000
Binary files a/static/images/cloud_cost/account_filtering/account_filtering_setup.png and /dev/null differ
diff --git a/static/images/cloud_cost/setup/aws_cloudformation_setup.jpg b/static/images/cloud_cost/setup/aws_cloudformation_setup.jpg
new file mode 100644
index 00000000000..2c45d89593f
Binary files /dev/null and b/static/images/cloud_cost/setup/aws_cloudformation_setup.jpg differ
diff --git a/static/images/cloud_cost/setup/aws_manual_setup.jpg b/static/images/cloud_cost/setup/aws_manual_setup.jpg
new file mode 100644
index 00000000000..8e9d2431f43
Binary files /dev/null and b/static/images/cloud_cost/setup/aws_manual_setup.jpg differ


Reviews:
user: login: buraizu
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-21T18:33:45Z
user: login: buraizu
state: APPROVED
author_association: CONTRIBUTOR
submitted_at: 2025-05-21T21:53:40Z

Review comments:
diff_hunk: @@ -25,6 +25,49 @@ To set up Cloud Cost Management in Datadog, you should:
 
 ## Setup
 
+### Configure the AWS integration
+
+Navigate to [Setup & Configuration][7] and select an AWS account from the dropdown menu to pull costs from.
+
+**Note**: Datadog recommends sending a Cost and Usage Report from an [AWS **management account**][2] for cost visibility into related **member accounts**. If you send a Cost and Usage report from an AWS **member account**, ensure that you have selected the following options in your **management account's** [preferences][3]:
+
+* **Linked Account Access**
+* **Linked Account Refunds and Credits**
+* **Linked Account Discounts**
+
+This ensures complete cost accuracy by allowing periodic cost calculations against the AWS Cost Explorer.
+
+{{< tabs >}}
+
+{{% tab "CloudFormation" %}}
+
+{{< img src="cloud_cost/setup/aws_cloudformation_setup.jpg" alt="Cloud Cost Management setup form in CloudFormation mode" style="width:100%" >}}
+
+### Select which resources need to be created
path: content/en/cloud_cost_management/setup/aws.md
user: login: buraizu
body: ```suggestion
### Select the resources to create
```
created_at: 2025-05-21T18:03:05Z
author_association: CONTRIBUTOR
diff_hunk: @@ -25,6 +25,49 @@ To set up Cloud Cost Management in Datadog, you should:
 
 ## Setup
 
+### Configure the AWS integration
+
+Navigate to [Setup & Configuration][7] and select an AWS account from the dropdown menu to pull costs from.
+
+**Note**: Datadog recommends sending a Cost and Usage Report from an [AWS **management account**][2] for cost visibility into related **member accounts**. If you send a Cost and Usage report from an AWS **member account**, ensure that you have selected the following options in your **management account's** [preferences][3]:
+
+* **Linked Account Access**
+* **Linked Account Refunds and Credits**
+* **Linked Account Discounts**
+
+This ensures complete cost accuracy by allowing periodic cost calculations against the AWS Cost Explorer.
+
+{{< tabs >}}
+
+{{% tab "CloudFormation" %}}
+
+{{< img src="cloud_cost/setup/aws_cloudformation_setup.jpg" alt="Cloud Cost Management setup form in CloudFormation mode" style="width:100%" >}}
+
+### Select which resources need to be created
+
+The CloudFormation stack can be configured in three ways depending on your existing AWS resources:
+
+* **New setup**: Select **Create Cost and Usage Report** to create both the report and its S3 bucket
+* **Existing bucket**: Select **Create Cost and Usage Report** and unselect **Create S3 Bucket** to use an existing S3 bucket
+* **Existing report**: Unselect **Create Cost and Usage Report** to import an existing Cost and Usage Report
+
+### Configure the Cost and Usage Report settings
+
+Enter the following details for your Cost and Usage Report:
+
+* **Bucket Name**: The S3 bucket name where the report files are stored.
+* **Bucket Region**: The AWS region of your S3 bucket. For example, `us-east-1`.
path: content/en/cloud_cost_management/setup/aws.md
user: login: buraizu
body: ```suggestion
* **Bucket Region**: The AWS [region code][100] of the region containing your S3 bucket. For example, `us-east-1`.
```
created_at: 2025-05-21T18:11:08Z
author_association: CONTRIBUTOR
diff_hunk: @@ -25,6 +25,49 @@ To set up Cloud Cost Management in Datadog, you should:
 
 ## Setup
 
+### Configure the AWS integration
+
+Navigate to [Setup & Configuration][7] and select an AWS account from the dropdown menu to pull costs from.
+
+**Note**: Datadog recommends sending a Cost and Usage Report from an [AWS **management account**][2] for cost visibility into related **member accounts**. If you send a Cost and Usage report from an AWS **member account**, ensure that you have selected the following options in your **management account's** [preferences][3]:
+
+* **Linked Account Access**
+* **Linked Account Refunds and Credits**
+* **Linked Account Discounts**
+
+This ensures complete cost accuracy by allowing periodic cost calculations against the AWS Cost Explorer.
+
+{{< tabs >}}
+
+{{% tab "CloudFormation" %}}
+
+{{< img src="cloud_cost/setup/aws_cloudformation_setup.jpg" alt="Cloud Cost Management setup form in CloudFormation mode" style="width:100%" >}}
+
+### Select which resources need to be created
+
+The CloudFormation stack can be configured in three ways depending on your existing AWS resources:
+
+* **New setup**: Select **Create Cost and Usage Report** to create both the report and its S3 bucket
+* **Existing bucket**: Select **Create Cost and Usage Report** and unselect **Create S3 Bucket** to use an existing S3 bucket
+* **Existing report**: Unselect **Create Cost and Usage Report** to import an existing Cost and Usage Report
+
+### Configure the Cost and Usage Report settings
+
+Enter the following details for your Cost and Usage Report:
+
+* **Bucket Name**: The S3 bucket name where the report files are stored.
+* **Bucket Region**: The AWS region of your S3 bucket. For example, `us-east-1`.
+* **Export Path Prefix**: The S3 path prefix where report files are stored.
+* **Export Name**: The name of your Cost and Usage Report.
+
+**Note**: These values either locate your existing Cost and Usage Report or define the settings for newly created resources.
+
path: content/en/cloud_cost_management/setup/aws.md
user: login: buraizu
body: ```suggestion

[100]: https://docs.aws.amazon.com/global-infrastructure/latest/regions/aws-regions.html
```
created_at: 2025-05-21T18:11:22Z
author_association: CONTRIBUTOR
diff_hunk: @@ -25,6 +25,49 @@ To set up Cloud Cost Management in Datadog, you should:
 
 ## Setup
 
+### Configure the AWS integration
+
+Navigate to [Setup & Configuration][7] and select an AWS account from the dropdown menu to pull costs from.
+
+**Note**: Datadog recommends sending a Cost and Usage Report from an [AWS **management account**][2] for cost visibility into related **member accounts**. If you send a Cost and Usage report from an AWS **member account**, ensure that you have selected the following options in your **management account's** [preferences][3]:
+
+* **Linked Account Access**
+* **Linked Account Refunds and Credits**
+* **Linked Account Discounts**
+
+This ensures complete cost accuracy by allowing periodic cost calculations against the AWS Cost Explorer.
+
+{{< tabs >}}
+
+{{% tab "CloudFormation" %}}
+
+{{< img src="cloud_cost/setup/aws_cloudformation_setup.jpg" alt="Cloud Cost Management setup form in CloudFormation mode" style="width:100%" >}}
+
+### Select which resources need to be created
+
+The CloudFormation stack can be configured in three ways depending on your existing AWS resources:
+
+* **New setup**: Select **Create Cost and Usage Report** to create both the report and its S3 bucket
+* **Existing bucket**: Select **Create Cost and Usage Report** and unselect **Create S3 Bucket** to use an existing S3 bucket
+* **Existing report**: Unselect **Create Cost and Usage Report** to import an existing Cost and Usage Report
+
+### Configure the Cost and Usage Report settings
+
+Enter the following details for your Cost and Usage Report:
+
+* **Bucket Name**: The S3 bucket name where the report files are stored.
+* **Bucket Region**: The AWS region of your S3 bucket. For example, `us-east-1`.
+* **Export Path Prefix**: The S3 path prefix where report files are stored.
+* **Export Name**: The name of your Cost and Usage Report.
+
+**Note**: These values either locate your existing Cost and Usage Report or define the settings for newly created resources.
path: content/en/cloud_cost_management/setup/aws.md
user: login: buraizu
body: ```suggestion
**Note**: These values either locate your existing Cost and Usage Report, or define the settings for newly created resources.
```
created_at: 2025-05-21T18:14:25Z
author_association: CONTRIBUTOR
diff_hunk: @@ -140,27 +171,21 @@ Attach the new S3 policy to the Datadog integration role.
 
 **Note:** Data can take up to 48 to 72 hours after setup to stabilize in Datadog.
 
+{{% /tab %}}
path: content/en/cloud_cost_management/setup/aws.md
user: login: buraizu
body: ```suggestion
[1]: https://docs.aws.amazon.com/cur/latest/userguide/dataexports-create-legacy.html
[4]: https://docs.aws.amazon.com/cur/latest/userguide/dataexports-view.html
[10]: https://docs.aws.amazon.com/cur/latest/userguide/enabling-split-cost-allocation-data.html
{{% /tab %}}
```
created_at: 2025-05-21T18:21:06Z
author_association: CONTRIBUTOR
diff_hunk: @@ -140,27 +171,21 @@ Attach the new S3 policy to the Datadog integration role.
 
 **Note:** Data can take up to 48 to 72 hours after setup to stabilize in Datadog.
 
+{{% /tab %}}
path: content/en/cloud_cost_management/setup/aws.md
user: login: buraizu
body: This suggestion should get the links to work as expected, but I recommend updating the in-tab reference links to be unique (perhaps beginning with `200`) for ease of maintenance.
created_at: 2025-05-21T18:22:23Z
author_association: CONTRIBUTOR
diff_hunk: @@ -25,6 +25,49 @@ To set up Cloud Cost Management in Datadog, you should:
 
 ## Setup
 
+### Configure the AWS integration
+
+Navigate to [Setup & Configuration][7] and select an AWS account from the dropdown menu to pull costs from.
+
+**Note**: Datadog recommends sending a Cost and Usage Report from an [AWS **management account**][2] for cost visibility into related **member accounts**. If you send a Cost and Usage report from an AWS **member account**, ensure that you have selected the following options in your **management account's** [preferences][3]:
+
+* **Linked Account Access**
+* **Linked Account Refunds and Credits**
+* **Linked Account Discounts**
+
+This ensures complete cost accuracy by allowing periodic cost calculations against the AWS Cost Explorer.
+
+{{< tabs >}}
+
+{{% tab "CloudFormation" %}}
+
+{{< img src="cloud_cost/setup/aws_cloudformation_setup.jpg" alt="Cloud Cost Management setup form in CloudFormation mode" style="width:100%" >}}
+
+### Select which resources need to be created
+
+The CloudFormation stack can be configured in three ways depending on your existing AWS resources:
+
+* **New setup**: Select **Create Cost and Usage Report** to create both the report and its S3 bucket
+* **Existing bucket**: Select **Create Cost and Usage Report** and unselect **Create S3 Bucket** to use an existing S3 bucket
+* **Existing report**: Unselect **Create Cost and Usage Report** to import an existing Cost and Usage Report
+
+### Configure the Cost and Usage Report settings
+
+Enter the following details for your Cost and Usage Report:
+
+* **Bucket Name**: The S3 bucket name where the report files are stored.
+* **Bucket Region**: The AWS region of your S3 bucket. For example, `us-east-1`.
+* **Export Path Prefix**: The S3 path prefix where report files are stored.
+* **Export Name**: The name of your Cost and Usage Report.
+
+**Note**: These values either locate your existing Cost and Usage Report or define the settings for newly created resources.
+
+{{% /tab %}}
+
+{{% tab "Manual" %}}
+
+{{< img src="cloud_cost/setup/aws_manual_setup.jpg" alt="Cloud Cost Management setup form in CloudFormation mode" style="width:100%" >}}
path: content/en/cloud_cost_management/setup/aws.md
user: login: buraizu
body: ```suggestion
{{< img src="cloud_cost/setup/aws_manual_setup.jpg" alt="Cloud Cost Management setup form in manual mode" style="width:100%" >}}
```
created_at: 2025-05-21T18:23:19Z
author_association: CONTRIBUTOR

PR comments:
user: login: github-actions[bot]
created_at: 2025-05-21T16:41:47Z
body: ## Preview links (active after the `build_preview` check completes)




### Modified Files
* https://docs-staging.datadoghq.com/gauthier/aws-setup-revamp/cloud_cost_management/setup/aws
author_association: CONTRIBUTOR
user: login: hinosxz
created_at: 2025-05-22T14:01:45Z
body: /merge
author_association: CONTRIBUTOR
user: login: dd-devflow[bot]
created_at: 2025-05-22T14:01:52Z
body: <!-- "FeedbackWorkflowId":"f72c4513-6562-434d-abab-c47281693a5c_36" -->
[View all feedbacks in Devflow UI.](https://mosaic.us1.ddbuild.io/devflow/logs/f72c4513-6562-434d-abab-c47281693a5c_36)

`2025-05-22 14:01:52 UTC` :information_source: Start processing command `/merge`

---
`2025-05-22 14:02:08 UTC` :information_source: **MergeQueue:** pull request added to the queue

The expected merge time in `master` is approximately 21m (p90).

---
`2025-05-22 14:19:29 UTC` :information_source: **MergeQueue:** This merge request was merged

author_association: NONE