Skip to content

Commit 10db3d6

Browse files
raymondeahclaude
andcommitted
[TON-466] feat(aws_quickstart): wire forwarding stack into main_extended and main_extended_workflow
These two templates also need the InstrumentationResourceTypes parameter (originally added only to main_v2 in v4.10.0) plus the same gating, role-stack wiring, and conditional forwarding stack as main_v2. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent c2f100d commit 10db3d6

2 files changed

Lines changed: 37 additions & 0 deletions

File tree

‎aws_quickstart/main_extended.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@ Conditions:
196196
Fn::Equals:
197197
- !Ref DisableResourceCollection
198198
- false
199+
ShouldForwardEvents:
200+
Fn::Not:
201+
- Fn::Equals:
202+
- !Join ["", !Ref InstrumentationResourceTypes]
203+
- ""
199204
EnableAgentlessScanning:
200205
Fn::And:
201206
- Fn::Not:
@@ -295,6 +300,19 @@ Resources:
295300
Parameters:
296301
DdApiKey: !Ref APIKey
297302
DdSite: !Ref DatadogSite
303+
# EventBridge pipeline forwarding CloudTrail events to the Datadog resource update
304+
# intake. Deployed only when at least one InstrumentationResourceTypes value is set;
305+
# single-region (covers the region this stack is deployed in).
306+
DatadogAgentResourceUpdateForwardingStack:
307+
Type: AWS::CloudFormation::Stack
308+
Condition: ShouldForwardEvents
309+
Properties:
310+
TemplateURL: "https://<BUCKET_PLACEHOLDER>.s3.amazonaws.com/aws/<VERSION_PLACEHOLDER>/datadog_agent_resource_update_forwarding.yaml"
311+
Parameters:
312+
APIKey: !Ref APIKey
313+
APPKey: !Ref APPKey
314+
DatadogSite: !Ref DatadogSite
315+
InstrumentationResourceTypes: !Join [",", !Ref InstrumentationResourceTypes]
298316
Outputs:
299317
IAMRoleName:
300318
Description: AWS IAM Role named to be used with the DataDog AWS Integration

‎aws_quickstart/main_extended_workflow.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,11 @@ Conditions:
219219
Fn::Equals:
220220
- !Ref DisableResourceCollection
221221
- false
222+
ShouldForwardEvents:
223+
Fn::Not:
224+
- Fn::Equals:
225+
- !Join ["", !Ref InstrumentationResourceTypes]
226+
- ""
222227
EnableAgentlessScanning:
223228
Fn::And:
224229
- Fn::Not:
@@ -556,6 +561,20 @@ Resources:
556561
stack_id: !Ref AWS::StackId
557562
forwarder_arn: !GetAtt ForwarderStack.Outputs.DatadogForwarderArn
558563

564+
# EventBridge pipeline forwarding CloudTrail events to the Datadog resource update
565+
# intake. Deployed only when at least one InstrumentationResourceTypes value is set;
566+
# single-region (covers the region this stack is deployed in).
567+
DatadogAgentResourceUpdateForwardingStack:
568+
Type: AWS::CloudFormation::Stack
569+
Condition: ShouldForwardEvents
570+
Properties:
571+
TemplateURL: "https://<BUCKET_PLACEHOLDER>.s3.amazonaws.com/aws/<VERSION_PLACEHOLDER>/datadog_agent_resource_update_forwarding.yaml"
572+
Parameters:
573+
APIKey: !Ref APIKey
574+
APPKey: !Ref APPKey
575+
DatadogSite: !Ref DatadogSite
576+
InstrumentationResourceTypes: !Join [",", !Ref InstrumentationResourceTypes]
577+
559578
# Step 6: Notify starting agentless scanning setup (if enabling)
560579
NotifyAgentlessScanningStarted:
561580
Type: Custom::WorkflowStatus

0 commit comments

Comments
 (0)