Skip to content

CCC-2211: Add CUR 2.0 Template for CCM CloudFormation Setup Method#334

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 5 commits into
masterfrom
tara.omalley/add-cur20-template
Jul 7, 2026
Merged

CCC-2211: Add CUR 2.0 Template for CCM CloudFormation Setup Method#334
gh-worker-dd-mergequeue-cf854d[bot] merged 5 commits into
masterfrom
tara.omalley/add-cur20-template

Conversation

@t-omalley

@t-omalley t-omalley commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Note: Please remember to review the contribution guidelines
if you have not yet done so.

What does this PR do?

  • Adds a CloudFormation template to set up CUR 2.0 configs in CCM
  • Updates documentation in the relevant README

Testing Guidelines

  • Tested E2E CloudFormation setup flow by uploading the new template into team's test bucket

Copy link
Copy Markdown
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

@datadog-official

This comment has been minimized.

@t-omalley t-omalley marked this pull request as ready for review July 1, 2026 18:07
@t-omalley t-omalley requested a review from a team as a code owner July 1, 2026 18:07
Comment thread aws_cloud_cost/cur2-main.yaml Outdated
COST_AND_USAGE_REPORT:
TIME_GRANULARITY: HOURLY
INCLUDE_RESOURCES: "TRUE"
INCLUDE_SPLIT_COST_ALLOCATION_DATA: "TRUE"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (correctness): Include the split cost allocation columns in the CUR 2.0 query

The table configuration enables INCLUDE_SPLIT_COST_ALLOCATION_DATA, but the SELECT list stops at tags and omits the split_line_item_* columns. The merged aws_cloud_cost_cur2 template selects these fields; without them, the exported Parquet files will not contain the split cost allocation data Datadog expects even though the export advertises it.

— Codex

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's a good catch, it's not in the minimal set of columns we require so we probably want to not include the split cost allocation by default. It'd be exporting more data than we need

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, just changed it to INCLUDE_SPLIT_COST_ALLOCATION_DATA: "FALSE"

Comment thread aws_cloud_cost/README.md
## Templates

- **`main.yaml`** — legacy Cost and Usage Report (CUR), via `AWS::CUR::ReportDefinition`.
- **`cur2-main.yaml`** — CUR 2.0 / BCM Data Exports, via `AWS::BCMDataExports::Export`.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might be out of my depth here so i'll let aws ints confirm but 2 main.yaml files feels like a weird pattern. should we just update the template that David created previously?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I can see why it's not ideal. If we updated David's template then the two CUR versions would have a different release.sh, and our existing one is already integrated into this repo's CI (so it doesn't need to be manually run).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm honestly OK with having just one template here (updating mine or just using yours). Feel free to remove mine in this PR, since long term we'll probably be only using just one of these anyways.

@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot merged commit 4167ae9 into master Jul 7, 2026
5 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot deleted the tara.omalley/add-cur20-template branch July 7, 2026 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants