diff --git a/spire/templates/apps-100A.yml b/spire/templates/apps-100A.yml index c4cffecb..9891e890 100644 --- a/spire/templates/apps-100A.yml +++ b/spire/templates/apps-100A.yml @@ -46,7 +46,6 @@ Parameters: DovetailRedisReplicationGroupEndpointPort: { Type: String } AnnounceResourcePrefix: { Type: String } PorterJobExecutionSnsTopicArn: { Type: AWS::SSM::Parameter::Value } - DovetailCdnLogsKinesisStreamArn: { Type: String } DovetailCountedKinesisStreamArn: { Type: String } X8664AsgCapacityProviderName: { Type: String } Aarch64AsgCapacityProviderName: { Type: String } @@ -195,7 +194,6 @@ Resources: ArrangementsDynamodbTableName: !Sub /prx/${EnvironmentTypeAbbreviation}/dovetail-cdn-arranger/ARRANGEMENTS_DDB_TABLE ArrangementsDynamodbAccessRoleArn: !Sub /prx/${EnvironmentTypeAbbreviation}/dovetail-cdn-arranger/ARRANGEMENTS_DDB_ACCESS_ROLE DovetailCdnLogsKinesisStreamArn: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/Dovetail-Counts/cdn-logs-kinesis-stream-arn-${AWS::Region} - OldDovetailCdnLogsKinesisStreamArn: !Ref DovetailCdnLogsKinesisStreamArn DovetailCountedKinesisStreamArn: !Ref DovetailCountedKinesisStreamArn DovetailRedisClientSecurityGroupId: !Ref DovetailRedisClientSecurityGroupId DovetailRedisReplicationGroupEndpointAddress: !Ref DovetailRedisReplicationGroupEndpointAddress diff --git a/spire/templates/apps/dovetail-counts.yml b/spire/templates/apps/dovetail-counts.yml index 9d7842d0..7b61a521 100644 --- a/spire/templates/apps/dovetail-counts.yml +++ b/spire/templates/apps/dovetail-counts.yml @@ -29,7 +29,6 @@ Parameters: ArrangementsDynamodbTableName: { Type: AWS::SSM::Parameter::Value } ArrangementsDynamodbAccessRoleArn: { Type: AWS::SSM::Parameter::Value } DovetailCdnLogsKinesisStreamArn: { Type: AWS::SSM::Parameter::Value } - OldDovetailCdnLogsKinesisStreamArn: { Type: String } DovetailCountedKinesisStreamArn: { Type: String } DovetailRedisReplicationGroupEndpointAddress: { Type: String } DovetailRedisReplicationGroupEndpointPort: { Type: String } @@ -83,14 +82,6 @@ Resources: KINESIS_IMPRESSION_STREAM: !Ref DovetailCountedKinesisStreamArn REDIS_URL: !Sub cluster://${DovetailRedisReplicationGroupEndpointAddress}:${DovetailRedisReplicationGroupEndpointPort} Events: - CountsBytesKinesisTrigger: - Properties: - BatchSize: 100 - BisectBatchOnFunctionError: true - Enabled: false - StartingPosition: LATEST - Stream: !Ref OldDovetailCdnLogsKinesisStreamArn - Type: Kinesis CountsBytesKinesisStreamTrigger: Properties: BatchSize: 100 diff --git a/spire/templates/root.yml b/spire/templates/root.yml index 70de6ce4..a31419be 100644 --- a/spire/templates/root.yml +++ b/spire/templates/root.yml @@ -702,7 +702,6 @@ Resources: SharedAuroraMysqlPort: !Ref SharedAuroraMysqlPort AnnounceResourcePrefix: !GetAtt SharedAnnounceStack.Outputs.ResourcePrefix PorterJobExecutionSnsTopicArn: !Sub /prx/${EnvironmentTypeAbbreviation}/Spire/${AWS::Region}/porter-job-execution-topic-arn - DovetailCdnLogsKinesisStreamArn: !GetAtt SharedDovetailKinesisStack.Outputs.DovetailCdnLogsKinesisStreamArn DovetailCountedKinesisStreamArn: !GetAtt SharedDovetailKinesisStack.Outputs.DovetailCountedKinesisStreamArn X8664AsgCapacityProviderName: !GetAtt SharedEcsAsgStack.Outputs.CapacityProviderName Aarch64AsgCapacityProviderName: !GetAtt SharedEcsAsgAarch64Stack.Outputs.CapacityProviderName