Update to new Datadog CFN template

Author: Tom McLaughlin

cfn-parameters.json

@@ -8,5 +8,6 @@
     "DatadogApiKey": $secrets.DATADOG_API_KEY,
     "DatadogAppKey": $secrets.DATADOG_APP_KEY,
     "DataDogLogsDestinationArn": $secrets.DATADOG_LOGS_DESTINATION_ARN,
-    "DatadogSite": "us5.datadoghq.com"
+    "DatadogSite": "us5.datadoghq.com",
+    "DatadogTemplateUrl": $vars.DATADOG_TEMPLATE_URL
 }

stacksets-shipping-template.yaml

@@ -26,6 +26,8 @@ Parameters:
     NoEcho: 'true'
   AwsOamSinkArn:
     Type: String
+  DatadogTemplateUrl:
+    Type: String
 
 Resources:
   DatadogIntegrationStackSet:
@@ -35,6 +37,7 @@ Resources:
       Parameters:
         DeploymentOrgId: !Ref AwsOrgRootId
         TargetRegions: !Ref TargetRegions
+        DatadogTemplateUrl: !Ref DatadogTemplateUrl
         DatadogApiKey: !Ref DatadogApiKey
         DatadogAppKey: !Ref DatadogAppKey
         DatadogSite: !Ref DatadogSite

stacksets/datadog-integration/stackset.yaml

@@ -18,6 +18,8 @@ Parameters:
   DisableMetricCollection:
     Type: String
     Default: 'false'
+  DatadogTemplateUrl:
+    Type: String
 
 Resources:
   DatadogLogShippingStackSet:
@@ -51,4 +53,4 @@ Resources:
         FailureToleranceCount: 1
         MaxConcurrentCount: 5
       PermissionModel: SERVICE_MANAGED
-      TemplateURL: https://datadog-cloudformation-template.s3.amazonaws.com/aws/main_organizations.yaml
+      TemplateURL: !Ref DatadogTemplateUrl

template.yaml

@@ -11,6 +11,8 @@ Parameters:
     Type: String
   ObservabilityOu:
     Type: String
+  DatadogTemplateUrl:
+    Type: String
   DatadogSite:
     Type: String
   DatadogApiKey:
@@ -29,7 +31,7 @@ Resources:
   DatadogIntegrationStack:
     Type: AWS::Serverless::Application
     Properties:
-      Location: "https://datadog-cloudformation-template.s3.amazonaws.com/aws/main_organizations.yaml"
+      Location: !Ref DatadogTemplateUrl
       Parameters:
         DatadogApiKey: !Ref DatadogApiKey
         DatadogAppKey: !Ref DatadogAppKey