Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace custom log tags with native tags #567

Merged
merged 2 commits into from
Nov 24, 2021
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
12 changes: 0 additions & 12 deletions stacks/apps-100A.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ Parameters:
SharedMemcachedEndpointAddress: { Type: String }
AmazonSesSmtpCredentialsGeneratorServiceToken: { Type: String }
CloudWatchAlarmTaggerServiceToken: { Type: String }
CloudWatchLogGroupTaggerServiceToken: { Type: String }
SharedEcsAsgInstanceSecurityGroupId: { Type: AWS::EC2::SecurityGroup::Id }
DeploymentPackageBucketName: { Type: String }
BetaHostname: { Type: String }
Expand Down Expand Up @@ -110,7 +109,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
SharedMemcachedEndpointAddress: !Ref SharedMemcachedEndpointAddress
VpcPrivateSubnet1Id: !Ref VpcPrivateSubnet1Id
VpcPrivateSubnet2Id: !Ref VpcPrivateSubnet2Id
Expand Down Expand Up @@ -148,7 +146,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
CodeS3Bucket: !Ref DeploymentPackageBucketName
CodeS3ObjectKey: !Ref DovetailCdnArrangerLambdaCodeS3ObjectKey
CloudFrontOai: !Ref DovetailCdnArrangerCloudFrontOai
Expand Down Expand Up @@ -181,7 +178,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
CodeS3Bucket: !Ref DeploymentPackageBucketName
CodeS3ObjectKey: !Ref DovetailCountsLambdaCodeS3ObjectKey
VpcId: !Ref VpcId
Expand Down Expand Up @@ -223,7 +219,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
CodeS3Bucket: !Ref DeploymentPackageBucketName
CodeS3ObjectKey: !Ref DovetailTrafficLambdaCodeS3ObjectKey
MetricsKinesisStreamArn: !Sub /prx/${EnvironmentTypeAbbreviation}/dovetail-traffic-lambda/METRICS_KINESIS_STREAM
Expand Down Expand Up @@ -261,7 +256,6 @@ Resources:
RootStackId: !Ref RootStackId
AmazonSesSmtpCredentialsGeneratorServiceToken: !Ref AmazonSesSmtpCredentialsGeneratorServiceToken
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
CmsHostname: !Ref CmsHostname
ExchangeHostname: !Ref ExchangeHostname
IdHostname: !Ref IdHostname
Expand Down Expand Up @@ -299,7 +293,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down Expand Up @@ -333,7 +326,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand All @@ -357,7 +349,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
CodeS3Bucket: !Ref DeploymentPackageBucketName
CodeS3ObjectKey: !Ref RadiotopiaTowerLambdaCodeS3ObjectKey
Tags:
Expand All @@ -383,7 +374,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
CodeS3Bucket: !Ref DeploymentPackageBucketName
CodeS3ObjectKey: !Ref S3SigningLambdaCodeS3ObjectKey
MediajointS3BucketArn: !Ref MediajointS3BucketArn
Expand Down Expand Up @@ -421,7 +411,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand All @@ -444,7 +433,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
CodeS3Bucket: !Ref DeploymentPackageBucketName
CodeS3ObjectKey: !Ref TheWorldSearchCodeS3ObjectKey
TheWorldSearchGoogleCustomSearchEngineId: !Ref TheWorldSearchGoogleCustomSearchEngineId
Expand Down
8 changes: 0 additions & 8 deletions stacks/apps-200A.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ Parameters:
AmazonSesSmtpCredentialsGeneratorServiceToken: { Type: String }
EchoServiceToken: { Type: String }
CloudWatchAlarmTaggerServiceToken: { Type: String }
CloudWatchLogGroupTaggerServiceToken: { Type: String }
EcsLaunchEndpointsAccessSecurityGroupId: { Type: AWS::EC2::SecurityGroup::Id }
KmsEndpointAccessSecurityGroupId: { Type: AWS::EC2::SecurityGroup::Id }
SharedEcsAsgInstanceSecurityGroupId: { Type: AWS::EC2::SecurityGroup::Id }
Expand Down Expand Up @@ -147,7 +146,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
CastleRdsPostgresqlEndpoint: !Ref CastleRdsPostgresqlEndpoint
CastlePostgresUsername: !Ref CastlePostgresUsername
CastlePostgresUserPassword: !Ref CastlePostgresUserPassword
Expand Down Expand Up @@ -184,7 +182,6 @@ Resources:
CodeS3ObjectKey: !Ref DovetailCdnOriginRequestLambdaCodeS3ObjectKey
ArrangerFunctionArn: !Ref DovetailCdnArrangerFunctionArn
ArrangerWorkspaceBucketArn: !Ref DovetailCdnArrangerWorkspaceBucketArn
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down Expand Up @@ -220,7 +217,6 @@ Resources:
RootStackId: !Ref RootStackId
AmazonSesSmtpCredentialsGeneratorServiceToken: !Ref AmazonSesSmtpCredentialsGeneratorServiceToken
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
S3SigningEndpointUrl: !Ref S3SigningEndpointUrl
S3SigningAccessKeyId: !Ref S3SigningAccessKeyId
SharedMemcachedEndpointAddress: !Ref SharedMemcachedEndpointAddress
Expand Down Expand Up @@ -260,7 +256,6 @@ Resources:
RootStackId: !Ref RootStackId
EchoServiceToken: !Ref EchoServiceToken
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
VpcPublicSubnet1Id: !Ref VpcPublicSubnet1Id
VpcPublicSubnet2Id: !Ref VpcPublicSubnet2Id
VpcPublicSubnet3Id: !Ref VpcPublicSubnet3Id
Expand Down Expand Up @@ -312,7 +307,6 @@ Resources:
SharedMemcachedEndpointPort: !Ref SharedMemcachedEndpointPort
EchoServiceToken: !Ref EchoServiceToken
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
EcsLaunchEndpointsAccessSecurityGroupId: !Ref EcsLaunchEndpointsAccessSecurityGroupId
KmsEndpointAccessSecurityGroupId: !Ref KmsEndpointAccessSecurityGroupId
SharedAuroraMysqlEndpoint: !Ref SharedAuroraMysqlEndpoint
Expand Down Expand Up @@ -348,7 +342,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
S3SigningUserName: !Ref S3SigningUserName
S3SigningEndpointUrl: !Ref S3SigningEndpointUrl
S3SigningAccessKeyId: !Ref S3SigningAccessKeyId
Expand Down Expand Up @@ -391,7 +384,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
SharedAuroraPostgresqlEndpoint: !Ref SharedAuroraPostgresqlEndpoint
SharedAuroraPostgresqlPort: !Ref SharedAuroraPostgresqlPort
PorterJobExecutionSnsTopicArn: !Ref PorterJobExecutionSnsTopicArn
Expand Down
6 changes: 0 additions & 6 deletions stacks/apps-300A.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Parameters:
DeploymentPackageBucketName: { Type: String }
EchoServiceToken: { Type: String }
CloudWatchAlarmTaggerServiceToken: { Type: String }
CloudWatchLogGroupTaggerServiceToken: { Type: String }
SharedEcsAsgInstanceSecurityGroupId: { Type: AWS::EC2::SecurityGroup::Id }
SharedRedisReplicationGroupEndpointAddress: { Type: String }
SharedRedisReplicationGroupEndpointPort: { Type: String }
Expand Down Expand Up @@ -93,7 +92,6 @@ Resources:
RootStackId: !Ref RootStackId
EchoServiceToken: !Ref EchoServiceToken
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
VpcPublicSubnet1Id: !Ref VpcPublicSubnet1Id
VpcPublicSubnet2Id: !Ref VpcPublicSubnet2Id
VpcPublicSubnet3Id: !Ref VpcPublicSubnet3Id
Expand Down Expand Up @@ -133,7 +131,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
CodeS3Bucket: !Ref DeploymentPackageBucketName
CodeS3ObjectKey: !Ref DovetailAnalyticsLambdaCodeS3ObjectKey
VpcId: !Ref VpcId
Expand Down Expand Up @@ -179,7 +176,6 @@ Resources:
RootStackId: !Ref RootStackId
EchoServiceToken: !Ref EchoServiceToken
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
VpcPublicSubnet1Id: !Ref VpcPublicSubnet1Id
VpcPublicSubnet2Id: !Ref VpcPublicSubnet2Id
VpcPublicSubnet3Id: !Ref VpcPublicSubnet3Id
Expand Down Expand Up @@ -223,7 +219,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
CastleHostname: !Ref CastleHostname
IdHostname: !Ref IdHostname
Tags:
Expand All @@ -249,7 +244,6 @@ Resources:
RootStackName: !Ref RootStackName
RootStackId: !Ref RootStackId
CloudWatchAlarmTaggerServiceToken: !Ref CloudWatchAlarmTaggerServiceToken
CloudWatchLogGroupTaggerServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
CodeS3Bucket: !Ref DeploymentPackageBucketName
CodeS3ObjectKey: !Ref ProxyLambdaCodeS3ObjectKey
CorporateHostname: !Ref CorporateHostname
Expand Down
16 changes: 0 additions & 16 deletions stacks/apps/augury.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Parameters:
RootStackId: { Type: String }
EchoServiceToken: { Type: String }
CloudWatchAlarmTaggerServiceToken: { Type: String }
CloudWatchLogGroupTaggerServiceToken: { Type: String }
VpcId: { Type: AWS::EC2::VPC::Id }
NewRelicApiKeyPrxLite: { Type: String }
SecretsBase: { Type: String }
Expand Down Expand Up @@ -250,11 +249,6 @@ Resources:
Type: AWS::Logs::LogGroup
Properties:
RetentionInDays: 14
WebTaskLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref WebTaskLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down Expand Up @@ -355,11 +349,6 @@ Resources:
Type: AWS::Logs::LogGroup
Properties:
RetentionInDays: 14
WorkerTaskLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref WorkerTaskLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down Expand Up @@ -543,11 +532,6 @@ Resources:
Type: AWS::Logs::LogGroup
Properties:
RetentionInDays: 14
SlowWorkerTaskLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref SlowWorkerTaskLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down
6 changes: 0 additions & 6 deletions stacks/apps/castle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Parameters:
RootStackName: { Type: String }
RootStackId: { Type: String }
CloudWatchAlarmTaggerServiceToken: { Type: String }
CloudWatchLogGroupTaggerServiceToken: { Type: String }
VpcId: { Type: AWS::EC2::VPC::Id }
VpcPrivateSubnet1Id: { Type: AWS::EC2::Subnet::Id }
VpcPrivateSubnet2Id: { Type: AWS::EC2::Subnet::Id }
Expand Down Expand Up @@ -152,11 +151,6 @@ Resources:
Type: AWS::Logs::LogGroup
Properties:
RetentionInDays: 14
TaskLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref TaskLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down
11 changes: 0 additions & 11 deletions stacks/apps/cms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Parameters:
RootStackId: { Type: String }
VpcId: { Type: AWS::EC2::VPC::Id }
CloudWatchAlarmTaggerServiceToken: { Type: String }
CloudWatchLogGroupTaggerServiceToken: { Type: String }
SecretsBase: { Type: String }
EcrImageTag: { Type: String }
SecretsVersion: { Type: String }
Expand Down Expand Up @@ -289,11 +288,6 @@ Resources:
Type: AWS::Logs::LogGroup
Properties:
RetentionInDays: 14
WebTaskLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref WebTaskLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down Expand Up @@ -384,11 +378,6 @@ Resources:
Type: AWS::Logs::LogGroup
Properties:
RetentionInDays: 14
WorkerTaskLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref WorkerTaskLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down
21 changes: 0 additions & 21 deletions stacks/apps/dovetail-analytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Parameters:
RootStackName: { Type: String }
RootStackId: { Type: String }
CloudWatchAlarmTaggerServiceToken: { Type: String }
CloudWatchLogGroupTaggerServiceToken: { Type: String }
CodeS3Bucket: { Type: String }
CodeS3ObjectKey: { Type: String }
VpcId: { Type: AWS::EC2::VPC::Id }
Expand Down Expand Up @@ -92,11 +91,6 @@ Resources:
Properties:
LogGroupName: !Sub /aws/lambda/${AnalyticsBigqueryFunction}
RetentionInDays: 14
AnalyticsBigqueryFunctionLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref AnalyticsBigqueryFunctionLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down Expand Up @@ -390,11 +384,6 @@ Resources:
Properties:
LogGroupName: !Sub /aws/lambda/${AnalyticsDynamoDbFunction}
RetentionInDays: 14
AnalyticsDynamoDbFunctionLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref AnalyticsDynamoDbFunctionLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down Expand Up @@ -662,11 +651,6 @@ Resources:
Properties:
LogGroupName: !Sub /aws/lambda/${AnalyticsPingbacksFunction}
RetentionInDays: 14
AnalyticsPingbacksFunctionLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref AnalyticsPingbacksFunctionLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down Expand Up @@ -961,11 +945,6 @@ Resources:
Properties:
LogGroupName: !Sub /aws/lambda/${AnalyticsRedisFunction}
RetentionInDays: 14
AnalyticsRedisFunctionLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref AnalyticsRedisFunctionLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down
6 changes: 0 additions & 6 deletions stacks/apps/dovetail-cdn-arranger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Parameters:
RootStackName: { Type: String }
RootStackId: { Type: String }
CloudWatchAlarmTaggerServiceToken: { Type: String }
CloudWatchLogGroupTaggerServiceToken: { Type: String }
CodeS3Bucket: { Type: String }
CodeS3ObjectKey: { Type: String }
CloudFrontOai: { Type: String }
Expand Down Expand Up @@ -155,11 +154,6 @@ Resources:
Properties:
LogGroupName: !Sub /aws/lambda/${ArrangerFunction}
RetentionInDays: 14
ArrangerFunctionLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref ArrangerFunctionLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down
6 changes: 0 additions & 6 deletions stacks/apps/dovetail-cdn-origin-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Parameters:
CodeS3ObjectKey: { Type: String }
ArrangerFunctionArn: { Type: String }
ArrangerWorkspaceBucketArn: { Type: String }
CloudWatchLogGroupTaggerServiceToken: { Type: String }

Conditions:
IsProduction: !Equals [!Ref EnvironmentType, Production]
Expand Down Expand Up @@ -76,11 +75,6 @@ Resources:
Properties:
LogGroupName: !Sub /aws/lambda/${OriginRequestFunction}
RetentionInDays: 14
OriginRequestFunctionLogGroupTags:
Type: Custom::CloudWatchLogGroupTags
Properties:
ServiceToken: !Ref CloudWatchLogGroupTaggerServiceToken
LogGroupName: !Ref OriginRequestFunctionLogGroup
Tags:
- { Key: prx:meta:tagging-version, Value: "2021-04-07" }
- { Key: prx:cloudformation:stack-name, Value: !Ref AWS::StackName }
Expand Down
Loading