Skip to content
Merged
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion aws/logs_monitoring/template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,10 @@ Parameters:
- "true"
- "false"
Description: Set to true to enable enhanced Lambda metrics. This will generate additional custom metrics for Lambda functions, including cold starts, estimated AWS costs, and custom tags. Default is false.
KmsKeyList:
Type: CommaDelimitedList
Default: ""
Description: List of KMS Key ARNs the Lambda forwarder function can use to decrypt, seperated by comma
Conditions:
IsAWSChina: !Equals [!Ref "AWS::Partition", aws-cn]
IsGovCloud: !Equals [!Ref "AWS::Partition", aws-us-gov]
Expand Down Expand Up @@ -378,6 +382,8 @@ Conditions:
- !Equals [!Join ["", !Ref VPCSubnetIds], ""]
SetDdLogLevel: !Not
- !Equals [!Ref DdLogLevel, ""]
SetDdForwarderDecryptKeys: !Not
- !Equals [!Join ["", !Ref KmsKeyList], ""]
Rules:
MustSetDdApiKey:
Assertions:
Expand Down Expand Up @@ -656,7 +662,10 @@ Resources:
# https://aws.amazon.com/premiumsupport/knowledge-center/s3-troubleshoot-403/#AWS_KMS_encryption
- Action:
- kms:Decrypt
Resource: "*"
Resource: !If
- SetDdForwarderDecryptKeys
- !Ref KmsKeyList
- "*"
Effect: Allow
- !If
- SetDDApiSsmParamName # Access the Datadog API key from Secrets Manager
Expand Down
Loading