diff --git a/lambda-cloudwatch-trigger-stack.yaml b/lambda-cloudwatch-trigger-stack.yaml index 9ab2f41..4ed10cd 100644 --- a/lambda-cloudwatch-trigger-stack.yaml +++ b/lambda-cloudwatch-trigger-stack.yaml @@ -192,4 +192,12 @@ Resources: Handler: index.lambda_handler Role: !GetAtt NewRelicLogsCloudWatchLambdaIAMRole.Arn Runtime: python3.12 - Timeout: 120 \ No newline at end of file + Timeout: 120 + + NewRelicLogsCloudWatchLambdaLogGroup: + Type: AWS::Logs::LogGroup + DeletionPolicy: Delete + Condition: HasValidLogGroups + Properties: + RetentionInDays: 14 + LogGroupName: !Sub "/aws/lambda/${NewRelicLogsCloudWatchLambda}" \ No newline at end of file diff --git a/lambda-template.yaml b/lambda-template.yaml index 4069538..50710ae 100644 --- a/lambda-template.yaml +++ b/lambda-template.yaml @@ -134,6 +134,14 @@ Resources: Runtime: python3.12 Timeout: 120 + NewRelicLogsAttributeValidationLambdaLogGroup: + Type: AWS::Logs::LogGroup + DeletionPolicy: Delete + Condition: IsCommonAttributesNotBlank + Properties: + RetentionInDays: 14 + LogGroupName: !Sub "/aws/lambda/${NewRelicLogsAttributeValidationLambda}" + NewRelicLogsResourceForAttributeValidation: Type: AWS::CloudFormation::CustomResource Condition: IsCommonAttributesNotBlank @@ -176,6 +184,12 @@ Resources: - secretsmanager:DescribeSecret Resource: !Sub 'arn:aws:secretsmanager:${AWS::Region}:${AWS::AccountId}:secret:*' + NewRelicLogsServerlessLogForwarderLogGroup: + Type: AWS::Logs::LogGroup + DeletionPolicy: Delete + Properties: + LogGroupName: !Sub "/aws/lambda/${NewRelicLogsServerlessLogForwarder}" + NewRelicLogsS3ARNConstructionLambdaIAMRole: Type: "AWS::IAM::Role" Properties: @@ -306,6 +320,14 @@ Resources: Timeout: 120 Role: !GetAtt NewRelicLogsS3ARNConstructionLambdaIAMRole.Arn + NewRelicLogsS3ARNConstructionLambdaLogGroup: + Type: AWS::Logs::LogGroup + DeletionPolicy: Delete + Condition: AddS3Trigger + Properties: + RetentionInDays: 14 + LogGroupName: !Sub "/aws/lambda/${NewRelicLogsS3ARNConstructionLambda}" + NewRelicLogsResourceForS3ARNConstruction: Type: AWS::CloudFormation::CustomResource Condition: AddS3Trigger @@ -425,6 +447,14 @@ Resources: Timeout: 120 Role: !GetAtt NewRelicLogsLogGroupArnConstructionLambdaIAMRole.Arn + NewRelicLogsLogGroupArnConstructionLambdaLogGroup: + Type: AWS::Logs::LogGroup + DeletionPolicy: Delete + Condition: AddCloudwatchTrigger + Properties: + RetentionInDays: 14 + LogGroupName: !Sub "/aws/lambda/${NewRelicLogsLogGroupArnConstructionLambda}" + NewRelicLogsResourceForLogGroupArnConstruction: Type: AWS::CloudFormation::CustomResource Condition: AddCloudwatchTrigger diff --git a/s3-trigger-stack.yaml b/s3-trigger-stack.yaml index 8fde2d5..980894c 100644 --- a/s3-trigger-stack.yaml +++ b/s3-trigger-stack.yaml @@ -200,6 +200,14 @@ Resources: Role: !GetAtt NewRelicLogsS3BucketTriggerIAMRole.Arn Runtime: python3.12 Timeout: 120 + + NewRelicLogsS3BucketTriggerLambdaLogGroup: + Type: AWS::Logs::LogGroup + DeletionPolicy: Delete + Condition: HasValidS3Buckets + Properties: + RetentionInDays: 14 + LogGroupName: !Sub "/aws/lambda/${NewRelicLogsS3BucketTriggerLambda}" Outputs: NewRelicLogsS3TriggerSetupErrors: