Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion aws/logs_monitoring/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def __init__(self, name, pattern, placeholder, enabled=True):
DD_CUSTOM_TAGS = "ddtags"
DD_SERVICE = "service"
DD_HOST = "host"
DD_FORWARDER_VERSION = "4.6.0"
DD_FORWARDER_VERSION = "4.7.0"

# CONST STRINGS
AWS_STRING = "aws"
Expand Down
32 changes: 16 additions & 16 deletions aws/logs_monitoring/template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Description: Pushes logs, metrics and traces from AWS to Datadog.
Mappings:
Constants:
DdForwarder:
Version: 4.6.0
LayerVersion: "81"
Version: 4.7.0
LayerVersion: "82"
Parameters:
DdApiKey:
Type: String
Expand Down Expand Up @@ -422,7 +422,7 @@ Resources:
- !Ref DdForwarderExistingBucketName
S3Key: !Sub
- "aws-dd-forwarder-${DdForwarderVersion}.zip"
- { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
- {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
- ZipFile: " "
MemorySize: !Ref MemorySize
Runtime: python3.12
Expand Down Expand Up @@ -619,8 +619,8 @@ Resources:
PolicyDocument:
Version: "2012-10-17"
Statement:
- !If # Access the s3 bucket that is used by the forwarder as a datastore
- SetForwarderBucket
- !If
- SetForwarderBucket # Access the s3 bucket that is used by the forwarder as a datastore
- Action:
- s3:GetObject
- s3:PutObject
Expand Down Expand Up @@ -660,8 +660,8 @@ Resources:
- kms:Decrypt
Resource: "*"
Effect: Allow
- !If # Access the Datadog API key from Secrets Manager
- SetDDApiSsmParamName
- !If
- SetDDApiSsmParamName # Access the Datadog API key from Secrets Manager
- !Ref AWS::NoValue
- Action:
- secretsmanager:GetSecretValue
Expand All @@ -679,31 +679,31 @@ Resources:
Resource: "*"
Effect: Allow
- !Ref AWS::NoValue
- !If # Get tags for log groups and attach them to the logs sent to Datadog
- SetDdFetchLogGroupTags
- !If
- SetDdFetchLogGroupTags # Get tags for log groups and attach them to the logs sent to Datadog
- Action:
- logs:ListTagsForResource
Resource: "*"
Effect: Allow
- !Ref AWS::NoValue
- !If # Required for Lambda deployed in VPC
- UseVPC
- !If
- UseVPC # Required for Lambda deployed in VPC
- Action:
- ec2:CreateNetworkInterface
- ec2:DescribeNetworkInterfaces
- ec2:DeleteNetworkInterface
Resource: "*"
Effect: Allow
- !Ref AWS::NoValue
- !If # To invoke a follower Lambda with the same event received by the forwarder for dual-shipping
- SetAdditionalTargetLambdas
- !If
- SetAdditionalTargetLambdas # To invoke a follower Lambda with the same event received by the forwarder for dual-shipping
- Action:
- lambda:InvokeFunction
Resource: !Ref AdditionalTargetLambdaArns
Effect: Allow
- !Ref AWS::NoValue
- !If # Access the Datadog API key from SSM
- SetDDApiSsmParamName
- !If
- SetDDApiSsmParamName # Access the Datadog API key from SSM
- Action:
- ssm:GetParameter
- ssm:GetParameters
Expand Down Expand Up @@ -824,7 +824,7 @@ Resources:
- !Ref SourceZipUrl
- !Sub
- "https://github.com/DataDog/datadog-serverless-functions/releases/download/aws-dd-forwarder-${DdForwarderVersion}/aws-dd-forwarder-${DdForwarderVersion}.zip"
- { DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version] }
- {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
# The Forwarder's source code is too big to fit the inline code size limit for CloudFormation. In most of AWS
# partitions and regions, the Forwarder is able to load its source code from a Lambda layer attached to it.
# In places where Datadog can't/doesn't yet publish Lambda layers, use another Lambda to copy the source code
Expand Down
Loading