Skip to content

feat(aws): support custom DatadogSite value #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktmq merged 4 commits into from
Mar 18, 2026
Merged

feat(aws): support custom DatadogSite value #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f39e92f
feat(aws): support custom DdSite value
ktmq Mar 5, 2026
4f2a12a
bump version
ktmq Mar 5, 2026
3f74ae7
Merge remote-tracking branch 'origin/master' into katie.mckew/add-dat…
ktmq Mar 18, 2026
d16ed92
feat(aws): update the other templates with the same change
ktmq Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions aws_quickstart/datadog_agentless_delegate_role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,11 @@ Parameters:

DatadogSite:
Type: String
Description: The Datadog site to use for the Datadog Agentless Scanner
Description: >-
The Datadog site to use for the Datadog Agentless Scanner.
Allowed values: datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com,
ap1.datadoghq.com, ap2.datadoghq.com.
Default: datadoghq.com
AllowedValues:
- datadoghq.com
- datadoghq.eu
- us3.datadoghq.com
- us5.datadoghq.com
- ap1.datadoghq.com
- ap2.datadoghq.com

AgentlessVulnerabilityScanning:
Type: String
Expand Down
12 changes: 4 additions & 8 deletions aws_quickstart/datadog_agentless_delegate_role_stackset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,11 @@ Parameters:

DatadogSite:
Type: String
Description: The Datadog site to use for the Datadog Agentless Scanner
Description: >-
The Datadog site to use for the Datadog Agentless Scanner.
Allowed values: datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com,
ap1.datadoghq.com, ap2.datadoghq.com.
Default: datadoghq.com
AllowedValues:
- datadoghq.com
- datadoghq.eu
- us3.datadoghq.com
- us5.datadoghq.com
- ap1.datadoghq.com
- ap2.datadoghq.com

AgentlessVulnerabilityScanning:
Type: String
Expand Down
12 changes: 4 additions & 8 deletions aws_quickstart/datadog_agentless_scanning.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,11 @@ Parameters:

DatadogSite:
Type: String
Description: The Datadog site to use for the Datadog Agentless Scanner
Description: >-
The Datadog site to use for the Datadog Agentless Scanner.
Allowed values: datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com,
ap1.datadoghq.com, ap2.datadoghq.com.
Default: datadoghq.com
AllowedValues:
- datadoghq.com
- datadoghq.eu
- us3.datadoghq.com
- us5.datadoghq.com
- ap1.datadoghq.com
- ap2.datadoghq.com

ScannerVPCId:
Type: String
Expand Down
13 changes: 4 additions & 9 deletions aws_quickstart/datadog_integration_api_call_v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,10 @@ Parameters:
DatadogSite:
Type: String
Default: datadoghq.com
Description: Define your Datadog Site to send data to.
AllowedValues:
- datadoghq.com
- datadoghq.eu
- us3.datadoghq.com
- us5.datadoghq.com
- ap1.datadoghq.com
- ap2.datadoghq.com
- ddog-gov.com
Description: >-
Copy link
Copy Markdown
Contributor

@raymondeah raymondeah Mar 5, 2026

Choose a reason for hiding this comment

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

should we add this to main_extended_workflow, datadog_agentless_delegate_role.yaml as well?

Define your Datadog Site to send data to.
Allowed values: datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com,
ap1.datadoghq.com, ap2.datadoghq.com, ddog-gov.com (GovCloud).
IAMRoleName:
Description: >-
The name of the IAM role created for Datadog's use.
Expand Down
38 changes: 20 additions & 18 deletions aws_quickstart/main_extended.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,10 @@ Parameters:
DatadogSite:
Type: String
Default: datadoghq.com
Description: Define your Datadog Site to send data to.
AllowedValues:
- datadoghq.com
- datadoghq.eu
- us3.datadoghq.com
- us5.datadoghq.com
- ap1.datadoghq.com
- ap2.datadoghq.com
- ddog-gov.com
Description: >-
Define your Datadog Site to send data to.
Allowed values: datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com,
ap1.datadoghq.com, ap2.datadoghq.com, ddog-gov.com (GovCloud).
IAMRoleName:
Description: Customize the name of IAM role for Datadog AWS integration
Type: String
Expand Down Expand Up @@ -162,6 +157,10 @@ Conditions:
Fn::Equals:
- !Ref DisableResourceCollection
- false
IsStaging:
Fn::Equals:
- !Ref DatadogSite
- datad0g.com
EnableAgentlessScanning:
Fn::And:
- Fn::Not:
Expand Down Expand Up @@ -243,18 +242,21 @@ Resources:
IAMRoleName: !Ref IAMRoleName
ResourceCollectionPermissions: !If [ResourceCollectionPermissions, true, false]
DdAWSAccountId: !If
- IsAP1
- "417141415827"
- IsStaging
- "727006795293"
- !If
- IsAP2
- "412381753143"
- IsAP1
- "417141415827"
- !If
- IsGov
- IsAP2
- "412381753143"
- !If
- IsAWSGovCloud
- "065115117704"
- "392588925713"
- "464622532012"
- IsGov
- !If
- IsAWSGovCloud
- "065115117704"
- "392588925713"
- "464622532012"
# The Lambda function to ship logs from S3 and CloudWatch, custom metrics and traces from Lambda functions to Datadog
# https://github.com/DataDog/datadog-serverless-functions/tree/master/aws/logs_monitoring
ForwarderStack:
Expand Down
38 changes: 20 additions & 18 deletions aws_quickstart/main_extended_workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,10 @@ Parameters:
DatadogSite:
Type: String
Default: datadoghq.com
Description: Define your Datadog Site to send data to.
AllowedValues:
- datadoghq.com
- datadoghq.eu
- us3.datadoghq.com
- us5.datadoghq.com
- ap1.datadoghq.com
- ap2.datadoghq.com
- ddog-gov.com
Description: >-
Define your Datadog Site to send data to.
Allowed values: datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com,
ap1.datadoghq.com, ap2.datadoghq.com, ddog-gov.com (GovCloud).
IAMRoleName:
Description: Customize the name of IAM role for Datadog AWS integration
Type: String
Expand Down Expand Up @@ -220,6 +215,10 @@ Conditions:
Fn::And:
- Condition: NoForwarder
- Condition: NoAgentlessScanning
IsStaging:
Fn::Equals:
- !Ref DatadogSite
- datad0g.com
IsAP1:
Fn::Equals:
- !Ref DatadogSite
Expand Down Expand Up @@ -448,18 +447,21 @@ Resources:
IAMRoleName: !Ref IAMRoleName
ResourceCollectionPermissions: !If [ResourceCollectionPermissions, true, false]
DdAWSAccountId: !If
- IsAP1
- "417141415827"
- IsStaging
- "727006795293"
- !If
- IsAP2
- "412381753143"
- IsAP1
- "417141415827"
- !If
- IsGov
- IsAP2
- "412381753143"
- !If
- IsAWSGovCloud
- "065115117704"
- "392588925713"
- "464622532012"
- IsGov
- !If
- IsAWSGovCloud
- "065115117704"
- "392588925713"
- "464622532012"

# Step 3: Notify IAM role creation finished
NotifyIAMRoleCreationFinished:
Expand Down
38 changes: 20 additions & 18 deletions aws_quickstart/main_v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,10 @@ Parameters:
DatadogSite:
Type: String
Default: datadoghq.com
Description: Define your Datadog Site to send data to.
AllowedValues:
- datadoghq.com
- datadoghq.eu
- us3.datadoghq.com
- us5.datadoghq.com
- ap1.datadoghq.com
- ap2.datadoghq.com
- ddog-gov.com
Description: >-
Define your Datadog Site to send data to.
Allowed values: datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com,
ap1.datadoghq.com, ap2.datadoghq.com, ddog-gov.com (GovCloud).
IAMRoleName:
Description: Customize the name of IAM role for Datadog AWS integration
Type: String
Expand Down Expand Up @@ -96,6 +91,10 @@ Conditions:
Fn::Equals:
- !Ref DisableResourceCollection
- false
IsStaging:
Fn::Equals:
- !Ref DatadogSite
- datad0g.com
IsAP1:
Fn::Equals:
- !Ref DatadogSite
Expand Down Expand Up @@ -136,18 +135,21 @@ Resources:
IAMRoleName: !Ref IAMRoleName
ResourceCollectionPermissions: !If [ResourceCollectionPermissions, true, false]
DdAWSAccountId: !If
- IsAP1
- "417141415827"
- IsStaging
- "727006795293"
- !If
- IsAP2
- "412381753143"
- IsAP1
- "417141415827"
- !If
- IsGov
- IsAP2
- "412381753143"
- !If
- IsAWSGovCloud
- "065115117704"
- "392588925713"
- "464622532012"
- IsGov
- !If
- IsAWSGovCloud
- "065115117704"
- "392588925713"
- "464622532012"
# The Lambda function to ship logs from S3 and CloudWatch, custom metrics and traces from Lambda functions to Datadog
# https://github.com/DataDog/datadog-serverless-functions/tree/master/aws/logs_monitoring
ForwarderStack:
Expand Down
38 changes: 20 additions & 18 deletions aws_quickstart/main_workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,10 @@ Parameters:
DatadogSite:
Type: String
Default: datadoghq.com
Description: Define your Datadog Site to send data to.
AllowedValues:
- datadoghq.com
- datadoghq.eu
- us3.datadoghq.com
- us5.datadoghq.com
- ap1.datadoghq.com
- ap2.datadoghq.com
- ddog-gov.com
Description: >-
Define your Datadog Site to send data to.
Allowed values: datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com,
ap1.datadoghq.com, ap2.datadoghq.com, ddog-gov.com (GovCloud).
IAMRoleName:
Description: Customize the name of IAM role for Datadog AWS integration
Type: String
Expand Down Expand Up @@ -85,6 +80,10 @@ Conditions:
Fn::Equals:
- !Ref DisableResourceCollection
- false
IsStaging:
Fn::Equals:
- !Ref DatadogSite
- datad0g.com
IsAP1:
Fn::Equals:
- !Ref DatadogSite
Expand Down Expand Up @@ -308,18 +307,21 @@ Resources:
IAMRoleName: !Ref IAMRoleName
ResourceCollectionPermissions: !If [ResourceCollectionPermissions, true, false]
DdAWSAccountId: !If
- IsAP1
- "417141415827"
- IsStaging
- "727006795293"
- !If
- IsAP2
- "412381753143"
- IsAP1
- "417141415827"
- !If
- IsGov
- IsAP2
- "412381753143"
- !If
- IsAWSGovCloud
- "065115117704"
- "392588925713"
- "464622532012"
- IsGov
- !If
- IsAWSGovCloud
- "065115117704"
- "392588925713"
- "464622532012"

# Step 3: Notify IAM role creation finished
NotifyIAMRoleCreationFinished:
Expand Down
2 changes: 1 addition & 1 deletion aws_quickstart/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v4.7.1
v4.7.2
Loading