diff --git a/content/en/cloud_cost_management/setup/aws.md b/content/en/cloud_cost_management/setup/aws.md index d709089da5d..806cd7645e9 100644 --- a/content/en/cloud_cost_management/setup/aws.md +++ b/content/en/cloud_cost_management/setup/aws.md @@ -59,8 +59,15 @@ The CloudFormation stack can be configured in three ways depending on your exist ### Configure the Cost and Usage Report settings -Enter the following details for your Cost and Usage Report: +If using an existing Cost and Usage Report 2.0 and bucket: +* Select your report from the {{< ui >}}Data Export{{< /ui >}} field and continue to the next step. + +{{< img src="cloud_cost/setup/aws_data_export_selector.png" alt="CCM Setup Page with Create Cost and Usage Report and Create S3 Bucket unselected, showing the Data Export selector used to select an existing export" style="width:100%" >}} + +Otherwise, enter the following details for your Cost and Usage Report: + +* {{< ui >}}Report Content{{< /ui >}}: The version of your Cost and Usage Report (Legacy CUR or CUR 2.0). * {{< ui >}}Bucket Name{{< /ui >}}: The S3 bucket name where the report files are stored. * {{< ui >}}Bucket Region{{< /ui >}}: The AWS [region code][100] of the region containing your S3 bucket. For example, `us-east-1`. * {{< ui >}}Export Path Prefix{{< /ui >}}: The S3 path prefix where report files are stored. @@ -92,8 +99,15 @@ The Terraform configuration supports three setups depending on your existing AWS ### Configure the Cost and Usage Report settings -Enter the following details for your Cost and Usage Report: +If using an existing Cost and Usage Report 2.0 and bucket: + +* Select your report from the {{< ui >}}Data Export{{< /ui >}} field and continue to the next step. + +{{< img src="cloud_cost/setup/aws_data_export_selector.png" alt="CCM Setup Page with Create Cost and Usage Report and Create S3 Bucket unselected, showing the Data Export selector used to select an existing export" style="width:100%" >}} +Otherwise, enter the following details for your Cost and Usage Report: + +* {{< ui >}}Report Content{{< /ui >}}: The version of your Cost and Usage Report (Legacy CUR or CUR 2.0). * {{< ui >}}Bucket Name{{< /ui >}}: The S3 bucket name where the report files are stored. * {{< ui >}}Bucket Region{{< /ui >}}: The AWS [region code][100] of the region containing your S3 bucket. For example, `us-east-1`. * {{< ui >}}Export Path Prefix{{< /ui >}}: The S3 path prefix where report files are stored. @@ -119,13 +133,11 @@ In the CCM Terraform setup UI, follow the instructions in the {{< ui >}}Apply Te ### Prerequisite: generate a Cost and Usage Report -[Create a Legacy Cost and Usage Report][201] in AWS under the {{< ui >}}Data Exports{{< /ui >}} section. - -Select the Export type {{< ui >}}Legacy CUR export{{< /ui >}}. +Create either a [Cost and Usage Report 2.0][202] or a [Legacy Cost and Usage Report][201] in AWS under the {{< ui >}}Data Exports{{< /ui >}} section. Select the following content options: -* Export type: {{< ui >}}Legacy CUR export{{< /ui >}} +* Export type: {{< ui >}}CUR 2.0 export{{< /ui >}} or {{< ui >}}Legacy CUR export{{< /ui >}} * {{< ui >}}Include resource IDs{{< /ui >}} * {{< ui >}}Split cost allocation data{{< /ui >}} (Enables ECS Cost Allocation. You must also opt in to [AWS Split Cost Allocation][210] in Cost Explorer preferences). * {{< ui >}}Refresh automatically{{< /ui >}} @@ -136,9 +148,11 @@ Select the following delivery options: * Report versioning: {{< ui >}}Create new report version{{< /ui >}} * Compression type: {{< ui >}}GZIP{{< /ui >}} or {{< ui >}}Parquet{{< /ui >}} +**Note**: Datadog only supports one Cost and Usage Report per member account. + ### 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][204]. Select the legacy CUR export that you created, then select {{< ui >}}Edit{{< /ui >}} 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 CUR export that you created, then select {{< ui >}}Edit{{< /ui >}} to see the details of the export. To enable Datadog to locate the Cost and Usage Report, complete the fields with their corresponding details: @@ -148,7 +162,7 @@ To enable Datadog to locate the Cost and Usage Report, complete the fields with * **Note:** The following prefix formats are not supported: empty, starting with `/` (such as `/` or `/cost`), or ending with `/` (such as `cost/`). Prefixes containing `/` in the middle are supported (such as `cost/hourly`). * {{< ui >}}Export Name{{< /ui >}}: This is the Export name in the Export name section. -**Note**: Datadog only supports legacy Cost and Usage Reports (CURs) generated by AWS. Do not modify or move the files generated by AWS, or attempt to provide access to files generated by a third party. +**Note**: Datadog only supports Cost and Usage Reports (CURs) generated by AWS. Do not modify or move the files generated by AWS, or attempt to provide access to files generated by a third party. {{< site-region region="gov,gov2" >}}
The AWS Cost and Usage Reports endpoint is used to validate the above fields against the CUR export in your S3 bucket. This endpoint is not FIPS validated.
@@ -222,6 +236,7 @@ Attach the new S3 policy to the Datadog integration role. **Note**: It may take between 48 and 72 hours for all available data to populate in your Datadog organization after a complete Cost and Usage Report is generated. If 72 hours have passed and the data has still not yet populated, contact [Datadog Support][18]. [201]: https://docs.aws.amazon.com/cur/latest/userguide/dataexports-create-legacy.html +[202]: https://docs.aws.amazon.com/cur/latest/userguide/dataexports-create-standard.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 @@ -363,6 +378,8 @@ To ensure consistency, Datadog normalizes tag keys using underscores and lowerca |product/region|us-east-1|product/region:us-east-1| |product/usagetype|DataTransfer-Regional-Bytes|product/usagetype:DataTransfer-Regional-Bytes| +Refer to the [AWS CUR 2.0 documentation][33] to learn more about additional columns in the CUR 2.0 export. + ### AWS resource tags [AWS resource tags][12] are user-defined tags that appear in the AWS console when viewing a particular resource, such as an EC2 instance or S3 bucket. @@ -525,3 +542,4 @@ After the billing conductor CUR is created, follow the Cloud Cost Management ins [30]: /cloud_cost_management/recommendations/ [31]: https://docs.aws.amazon.com/cost-management/latest/userguide/cost-optimization-hub.html [32]: /integrations/amazon_web_services/ +[33]: https://docs.aws.amazon.com/cur/latest/userguide/table-dictionary-cur2.html diff --git a/static/images/cloud_cost/setup/aws_cloudformation_setup.png b/static/images/cloud_cost/setup/aws_cloudformation_setup.png index 32e88c0cf8f..c42479ca326 100644 Binary files a/static/images/cloud_cost/setup/aws_cloudformation_setup.png and b/static/images/cloud_cost/setup/aws_cloudformation_setup.png differ diff --git a/static/images/cloud_cost/setup/aws_data_export_selector.png b/static/images/cloud_cost/setup/aws_data_export_selector.png new file mode 100644 index 00000000000..16b428e9e3b Binary files /dev/null and b/static/images/cloud_cost/setup/aws_data_export_selector.png differ diff --git a/static/images/cloud_cost/setup/aws_manual_setup.png b/static/images/cloud_cost/setup/aws_manual_setup.png index 2b94412215a..219d2b22cb0 100644 Binary files a/static/images/cloud_cost/setup/aws_manual_setup.png and b/static/images/cloud_cost/setup/aws_manual_setup.png differ diff --git a/static/images/cloud_cost/setup/aws_terraform_setup.png b/static/images/cloud_cost/setup/aws_terraform_setup.png index fd79ed8d264..c811f3d2be5 100644 Binary files a/static/images/cloud_cost/setup/aws_terraform_setup.png and b/static/images/cloud_cost/setup/aws_terraform_setup.png differ