enable CloudWatch account policy again

ServerlessOpsIO · Oct 23, 2024 · 3c5eabd · 3c5eabd
1 parent 5256007
commit 3c5eabd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/stacksets/datadog-shipping/logs-template.yaml b/stacksets/datadog-shipping/logs-template.yaml
@@ -159,14 +159,14 @@ Resources:
             LogGroupName: !Ref DeliveryStreamLogGroup
             LogStreamName: !Ref BackupDeliveryLogStream
 
-  #CloudWatchAccountPolicy:
-  #  Type: AWS::Logs::AccountPolicy
-  #  DependsOn: CloudWatchLogsPolicy
-  #  Properties:
-  #    PolicyName: Datadog-Logs-Firehose
-  #    PolicyDocument: !Sub '{ "RoleArn": "${CloudWatchLogsRole.Arn}", "DestinationArn": "${DatadogDeliveryStream.Arn}", "FilterPattern": ""}'
-  #    SelectionCriteria: !Sub 'LogGroupName NOT IN ["${DeliveryStreamLogGroup}"]'
-  #    PolicyType: "SUBSCRIPTION_FILTER_POLICY"
+  CloudWatchAccountPolicy:
+    Type: AWS::Logs::AccountPolicy
+    DependsOn: CloudWatchLogsPolicy
+    Properties:
+      PolicyName: Datadog-Logs-Firehose
+      PolicyDocument: !Sub '{ "RoleArn": "${CloudWatchLogsRole.Arn}", "DestinationArn": "${DatadogDeliveryStream.Arn}", "FilterPattern": ""}'
+      SelectionCriteria: !Sub 'LogGroupName NOT IN ["${DeliveryStreamLogGroup}"]'
+      PolicyType: "SUBSCRIPTION_FILTER_POLICY"
 
   DatadogLogsDestination:
     Type: AWS::Logs::Destination

diff --git a/stacksets/logging/template.yaml b/stacksets/logging/template.yaml
@@ -22,10 +22,10 @@ Resources:
               Service: !Sub "logs.${AWS::Region}.amazonaws.com"
             Action: sts:AssumeRole
 
-  #CloudWatchAccountPolicy:
-  #  Type: AWS::Logs::AccountPolicy
-  #  Condition: IsNotLoggingAccount
-  #  Properties:
-  #    PolicyName: Datadog-Logs-Firehose
-  #    PolicyDocument: !Sub '{ "RoleArn": "${CloudWatchLogsRole.Arn}", "DestinationArn": "${DestinationArn}", "FilterPattern": ""}'
-  #    PolicyType: "SUBSCRIPTION_FILTER_POLICY"
+  CloudWatchAccountPolicy:
+    Type: AWS::Logs::AccountPolicy
+    Condition: IsNotLoggingAccount
+    Properties:
+      PolicyName: Datadog-Logs-Firehose
+      PolicyDocument: !Sub '{ "RoleArn": "${CloudWatchLogsRole.Arn}", "DestinationArn": "${DestinationArn}", "FilterPattern": ""}'
+      PolicyType: "SUBSCRIPTION_FILTER_POLICY"