Skip to content

Commit 401d341

Browse files
iakov-awsiakov-aws
authored
release 3.13.0 (#386)
* release 3.13.0 * revert table for TAPriority
1 parent f67d741 commit 401d341

File tree

7 files changed

+41
-40
lines changed

7 files changed

+41
-40
lines changed

‎data-collection/deploy/deploy-data-collection.yaml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# https://github.com/awslabs/cid-data-collection-framework/blob/main/data-collection/deploy/deploy-data-collection.yaml
22
AWSTemplateFormatVersion: '2010-09-09'
3-
Description: CID Data Collection Stack v3.12.1 - AWS Solution SO9011
3+
Description: CID Data Collection Stack v3.13.0 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -132,10 +132,10 @@ Mappings:
132132
us-west-1: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-1 }
133133
us-west-2: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-2 }
134134
StepFunctionCode:
135-
main-state-machine: {TemplatePath: cfn/data-collection/v3.12.1/source/step-functions/main-state-machine.json}
136-
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.12.1/source/step-functions/crawler-state-machine.json}
137-
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.12.1/source/step-functions/standalone-state-machine.json}
138-
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.12.1/source/step-functions/health-detail-state-machine.json}
135+
main-state-machine: {TemplatePath: cfn/data-collection/v3.13.0/source/step-functions/main-state-machine.json}
136+
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.13.0/source/step-functions/crawler-state-machine.json}
137+
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.13.0/source/step-functions/standalone-state-machine.json}
138+
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.13.0/source/step-functions/health-detail-state-machine.json}
139139

140140
Parameters:
141141
DestinationBucket:
@@ -1032,7 +1032,7 @@ Resources:
10321032
Type: AWS::CloudFormation::Stack
10331033
Condition: DeployTAModule
10341034
Properties:
1035-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-trusted-advisor.yaml"
1035+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-trusted-advisor.yaml"
10361036
Parameters:
10371037
DatabaseName: !Ref DatabaseName
10381038
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1054,7 +1054,7 @@ Resources:
10541054
Type: AWS::CloudFormation::Stack
10551055
Condition: DeployRightsizingModule
10561056
Properties:
1057-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-cost-explorer-rightsizing.yaml"
1057+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-cost-explorer-rightsizing.yaml"
10581058
Parameters:
10591059
DatabaseName: !Ref DatabaseName
10601060
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1075,7 +1075,7 @@ Resources:
10751075
Type: AWS::CloudFormation::Stack
10761076
Condition: DeployCostAnomalyModule
10771077
Properties:
1078-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-cost-anomaly.yaml"
1078+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-cost-anomaly.yaml"
10791079
Parameters:
10801080
DatabaseName: !Ref DatabaseName
10811081
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1097,7 +1097,7 @@ Resources:
10971097
Type: AWS::CloudFormation::Stack
10981098
Condition: DeploySupportCasesModule
10991099
Properties:
1100-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-support-cases.yaml"
1100+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-support-cases.yaml"
11011101
Parameters:
11021102
DatabaseName: !Ref DatabaseName
11031103
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1118,7 +1118,7 @@ Resources:
11181118
Type: AWS::CloudFormation::Stack
11191119
Condition: DeployBackupModule
11201120
Properties:
1121-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-backup.yaml"
1121+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-backup.yaml"
11221122
Parameters:
11231123
DatabaseName: !Ref DatabaseName
11241124
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1139,7 +1139,7 @@ Resources:
11391139
Type: AWS::CloudFormation::Stack
11401140
Condition: DeployInventoryCollectorModule
11411141
Properties:
1142-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-inventory.yaml"
1142+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-inventory.yaml"
11431143
Parameters:
11441144
DatabaseName: !Ref DatabaseName
11451145
DestinationBucket: !Ref S3Bucket
@@ -1166,7 +1166,7 @@ Resources:
11661166
Type: AWS::CloudFormation::Stack
11671167
Condition: DeployPricingModule
11681168
Properties:
1169-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-pricing.yaml"
1169+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-pricing.yaml"
11701170
Parameters:
11711171
DatabaseName: !Ref DatabaseName
11721172
DestinationBucket: !Ref S3Bucket
@@ -1189,7 +1189,7 @@ Resources:
11891189
Type: AWS::CloudFormation::Stack
11901190
Condition: DeployComputeOptimizerModule
11911191
Properties:
1192-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-compute-optimizer.yaml"
1192+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-compute-optimizer.yaml"
11931193
Parameters:
11941194
DestinationBucket: !Ref S3Bucket
11951195
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
@@ -1214,7 +1214,7 @@ Resources:
12141214
Type: AWS::CloudFormation::Stack
12151215
Condition: DeployEcsChargebackModule
12161216
Properties:
1217-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-ecs-chargeback.yaml"
1217+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-ecs-chargeback.yaml"
12181218
Parameters:
12191219
DatabaseName: !Ref DatabaseName
12201220
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1240,7 +1240,7 @@ Resources:
12401240
Type: AWS::CloudFormation::Stack
12411241
Condition: DeployRDSUtilizationModule
12421242
Properties:
1243-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-rds-usage.yaml"
1243+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-rds-usage.yaml"
12441244
Parameters:
12451245
DatabaseName: !Ref DatabaseName
12461246
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1266,7 +1266,7 @@ Resources:
12661266
Type: AWS::CloudFormation::Stack
12671267
Condition: DeployEUCUtilizationModule
12681268
Properties:
1269-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-workspaces-metrics.yaml"
1269+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-workspaces-metrics.yaml"
12701270
Parameters:
12711271
DatabaseName: !Ref DatabaseName
12721272
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1292,7 +1292,7 @@ Resources:
12921292
Type: AWS::CloudFormation::Stack
12931293
Condition: DeployOrgDataModule
12941294
Properties:
1295-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-organization.yaml"
1295+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-organization.yaml"
12961296
Parameters:
12971297
DatabaseName: !Ref DatabaseName
12981298
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1313,7 +1313,7 @@ Resources:
13131313
Type: AWS::CloudFormation::Stack
13141314
Condition: DeployBudgetsModule
13151315
Properties:
1316-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-budgets.yaml"
1316+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-budgets.yaml"
13171317
Parameters:
13181318
DatabaseName: !Ref DatabaseName
13191319
DestinationBucket: !Ref S3Bucket
@@ -1334,7 +1334,7 @@ Resources:
13341334
Type: AWS::CloudFormation::Stack
13351335
Condition: DeployTransitGatewayModule
13361336
Properties:
1337-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-transit-gateway.yaml"
1337+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-transit-gateway.yaml"
13381338
Parameters:
13391339
DatabaseName: !Ref DatabaseName
13401340
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1360,7 +1360,7 @@ Resources:
13601360
Type: AWS::CloudFormation::Stack
13611361
Condition: DeployAWSFeedsModule
13621362
Properties:
1363-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-aws-feeds.yaml"
1363+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-aws-feeds.yaml"
13641364
Parameters:
13651365
DatabaseName: !Ref DatabaseName
13661366
DestinationBucket: !Ref S3Bucket
@@ -1379,7 +1379,7 @@ Resources:
13791379
Type: AWS::CloudFormation::Stack
13801380
Condition: DeployISVFeedsModule
13811381
Properties:
1382-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-isv-feeds.yaml"
1382+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-isv-feeds.yaml"
13831383
Parameters:
13841384
DatabaseName: !Ref DatabaseName
13851385
DestinationBucket: !Ref S3Bucket
@@ -1397,7 +1397,7 @@ Resources:
13971397
Type: AWS::CloudFormation::Stack
13981398
Condition: DeployHealthEventsModule
13991399
Properties:
1400-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-health-events.yaml"
1400+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-health-events.yaml"
14011401
Parameters:
14021402
DatabaseName: !Ref DatabaseName
14031403
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1419,7 +1419,7 @@ Resources:
14191419
Type: AWS::CloudFormation::Stack
14201420
Condition: DeployLicenseManagerModule
14211421
Properties:
1422-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-license-manager.yaml"
1422+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-license-manager.yaml"
14231423
Parameters:
14241424
DatabaseName: !Ref DatabaseName
14251425
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1440,7 +1440,7 @@ Resources:
14401440
Type: AWS::CloudFormation::Stack
14411441
Condition: DeployServiceQuotasModule
14421442
Properties:
1443-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-service-quotas.yaml"
1443+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-service-quotas.yaml"
14441444
Parameters:
14451445
DatabaseName: !Ref DatabaseName
14461446
DestinationBucket: !Ref S3Bucket
@@ -1466,7 +1466,7 @@ Resources:
14661466
Type: AWS::CloudFormation::Stack
14671467
Condition: DeployQuickSightModule
14681468
Properties:
1469-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-quicksight.yaml"
1469+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-quicksight.yaml"
14701470
Parameters:
14711471
DatabaseName: !Ref DatabaseName
14721472
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1485,7 +1485,7 @@ Resources:
14851485
Type: AWS::CloudFormation::Stack
14861486
Condition: DeployResilienceHubModule
14871487
Properties:
1488-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-resilience-hub.yaml"
1488+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-resilience-hub.yaml"
14891489
Parameters:
14901490
DatabaseName: !Ref DatabaseName
14911491
DestinationBucket: !Ref S3Bucket
@@ -1510,7 +1510,7 @@ Resources:
15101510
Type: AWS::CloudFormation::Stack
15111511
Condition: DeployIncludeReferenceModule
15121512
Properties:
1513-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/module-reference.yaml"
1513+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/module-reference.yaml"
15141514
Parameters:
15151515
DatabaseName: !Ref DatabaseName
15161516
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1534,7 +1534,7 @@ Resources:
15341534
Type: AWS::CloudFormation::Stack
15351535
Condition: DeployAccountCollector
15361536
Properties:
1537-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/account-collector.yaml"
1537+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/account-collector.yaml"
15381538
Parameters:
15391539
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
15401540
ManagementAccountID: !Ref ManagementAccountID

‎data-collection/deploy/deploy-data-read-permissions.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# https://github.com/awslabs/cid-data-collection-framework/blob/main/data-collection/v3.12.1/deploy/deploy-data-read-permissions.yaml
1+
# https://github.com/awslabs/cid-data-collection-framework/blob/main/data-collection/v3.13.0/deploy/deploy-data-read-permissions.yaml
22
AWSTemplateFormatVersion: '2010-09-09'
3-
Description: CID Data Collection - All-in-One for Management Account v3.12.1 - AWS Solution SO9011
3+
Description: CID Data Collection - All-in-One for Management Account v3.13.0 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -198,7 +198,7 @@ Resources:
198198
DataCollectorMgmtAccountReadStack:
199199
Type: AWS::CloudFormation::Stack
200200
Properties:
201-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/deploy-in-management-account.yaml"
201+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/deploy-in-management-account.yaml"
202202
Parameters:
203203
DataCollectionAccountID: !Ref DataCollectionAccountID
204204
ManagementAccountRole: !Ref ManagementAccountRole
@@ -215,7 +215,7 @@ Resources:
215215
Type: AWS::CloudFormation::Stack
216216
Condition: DeployModuleReadInMgmt
217217
Properties:
218-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/deploy-in-linked-account.yaml"
218+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/deploy-in-linked-account.yaml"
219219
Parameters:
220220
DataCollectionAccountID: !Ref DataCollectionAccountID
221221
MultiAccountRoleName: !Ref MultiAccountRoleName
@@ -234,7 +234,7 @@ Resources:
234234
DataCollectorOrgAccountModulesReadStackSet:
235235
Type: AWS::CloudFormation::StackSet
236236
Properties:
237-
Description: "StackSet in charge of deploying read roles across organization accounts v3.12.1"
237+
Description: "StackSet in charge of deploying read roles across organization accounts v3.13.0"
238238
PermissionModel: SERVICE_MANAGED
239239
AutoDeployment:
240240
Enabled: true
@@ -281,4 +281,4 @@ Resources:
281281
- CAPABILITY_IAM
282282
- CAPABILITY_NAMED_IAM
283283
StackSetName: !Sub "StackSet-${AWS::AccountId}-OptimizationDataRole"
284-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.1/deploy-in-linked-account.yaml"
284+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.13.0/deploy-in-linked-account.yaml"

‎data-collection/deploy/deploy-in-linked-account.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AWSTemplateFormatVersion: '2010-09-09'
2-
Description: CID Data Collection - Role for Linked Account v3.12.1
2+
Description: CID Data Collection - Role for Linked Account v3.13.0
33
Metadata:
44
AWS::CloudFormation::Interface:
55
ParameterGroups:

‎data-collection/deploy/deploy-in-management-account.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AWSTemplateFormatVersion: '2010-09-09'
2-
Description: CID Data Collection - Role for Management Account v3.12.1
2+
Description: CID Data Collection - Role for Management Account v3.13.0
33
Metadata:
44
AWS::CloudFormation::Interface:
55
ParameterGroups:

‎data-collection/deploy/module-trusted-advisor.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,9 +895,10 @@ Resources:
895895

896896
# Add glue table for trusted advisor priority data
897897
TAPriorityTable:
898-
Type: Custom::ManageGlueTable
898+
Type: AWS::Glue::Table
899899
Properties:
900-
ServiceToken: !Ref LambdaManageGlueTableARN
900+
DatabaseName: !Ref DatabaseName
901+
CatalogId: !Ref AWS::AccountId
901902
TableInput:
902903
Name: trusted_advisor_priority_data
903904
TableType: EXTERNAL_TABLE

‎data-collection/deploy/source/step-functions/main-state-machine.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"EXE_UUID": "{% $split($states.context.Execution.Id, ':')[7] %}",
1818
"EXE_START_TIME_SPLIT": "{% $split($states.context.Execution.StartTime, /[-:T.]/) %}",
1919
"EXE_START_TIME": "{% $replace($states.context.Execution.StartTime,'Z','') %}",
20-
"STACK_VERSION": "v3.12.1"
20+
"STACK_VERSION": "v3.13.0"
2121
},
2222
"Next": "SetGlobalVariables2"
2323
},

‎data-collection/utils/version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "3.12.1"
2+
"version": "3.13.0"
33
}

0 commit comments

Comments
 (0)