Skip to content

Commit 3f92f06

Browse files
iakov-awsiakov-aws
authored
release 3.12.0 (#375)
1 parent 5cd97a4 commit 3f92f06

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
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.11.0 - AWS Solution SO9011
3+
Description: CID Data Collection Stack v3.12.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.11.0/source/step-functions/main-state-machine.json}
136-
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.11.0/source/step-functions/crawler-state-machine.json}
137-
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.11.0/source/step-functions/standalone-state-machine.json}
138-
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.11.0/source/step-functions/health-detail-state-machine.json}
135+
main-state-machine: {TemplatePath: cfn/data-collection/v3.12.0/source/step-functions/main-state-machine.json}
136+
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.12.0/source/step-functions/crawler-state-machine.json}
137+
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.12.0/source/step-functions/standalone-state-machine.json}
138+
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.12.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.11.0/module-trusted-advisor.yaml"
1035+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-trusted-advisor.yaml"
10361036
Parameters:
10371037
DatabaseName: !Ref DatabaseName
10381038
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1053,7 +1053,7 @@ Resources:
10531053
Type: AWS::CloudFormation::Stack
10541054
Condition: DeployRightsizingModule
10551055
Properties:
1056-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-cost-explorer-rightsizing.yaml"
1056+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-cost-explorer-rightsizing.yaml"
10571057
Parameters:
10581058
DatabaseName: !Ref DatabaseName
10591059
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1074,7 +1074,7 @@ Resources:
10741074
Type: AWS::CloudFormation::Stack
10751075
Condition: DeployCostAnomalyModule
10761076
Properties:
1077-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-cost-anomaly.yaml"
1077+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-cost-anomaly.yaml"
10781078
Parameters:
10791079
DatabaseName: !Ref DatabaseName
10801080
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1096,7 +1096,7 @@ Resources:
10961096
Type: AWS::CloudFormation::Stack
10971097
Condition: DeploySupportCasesModule
10981098
Properties:
1099-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-support-cases.yaml"
1099+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-support-cases.yaml"
11001100
Parameters:
11011101
DatabaseName: !Ref DatabaseName
11021102
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1117,7 +1117,7 @@ Resources:
11171117
Type: AWS::CloudFormation::Stack
11181118
Condition: DeployBackupModule
11191119
Properties:
1120-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-backup.yaml"
1120+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-backup.yaml"
11211121
Parameters:
11221122
DatabaseName: !Ref DatabaseName
11231123
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1138,7 +1138,7 @@ Resources:
11381138
Type: AWS::CloudFormation::Stack
11391139
Condition: DeployInventoryCollectorModule
11401140
Properties:
1141-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-inventory.yaml"
1141+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-inventory.yaml"
11421142
Parameters:
11431143
DatabaseName: !Ref DatabaseName
11441144
DestinationBucket: !Ref S3Bucket
@@ -1165,7 +1165,7 @@ Resources:
11651165
Type: AWS::CloudFormation::Stack
11661166
Condition: DeployPricingModule
11671167
Properties:
1168-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-pricing.yaml"
1168+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-pricing.yaml"
11691169
Parameters:
11701170
DatabaseName: !Ref DatabaseName
11711171
DestinationBucket: !Ref S3Bucket
@@ -1188,7 +1188,7 @@ Resources:
11881188
Type: AWS::CloudFormation::Stack
11891189
Condition: DeployComputeOptimizerModule
11901190
Properties:
1191-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-compute-optimizer.yaml"
1191+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-compute-optimizer.yaml"
11921192
Parameters:
11931193
DestinationBucket: !Ref S3Bucket
11941194
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
@@ -1213,7 +1213,7 @@ Resources:
12131213
Type: AWS::CloudFormation::Stack
12141214
Condition: DeployEcsChargebackModule
12151215
Properties:
1216-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-ecs-chargeback.yaml"
1216+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-ecs-chargeback.yaml"
12171217
Parameters:
12181218
DatabaseName: !Ref DatabaseName
12191219
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1239,7 +1239,7 @@ Resources:
12391239
Type: AWS::CloudFormation::Stack
12401240
Condition: DeployRDSUtilizationModule
12411241
Properties:
1242-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-rds-usage.yaml"
1242+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-rds-usage.yaml"
12431243
Parameters:
12441244
DatabaseName: !Ref DatabaseName
12451245
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1265,7 +1265,7 @@ Resources:
12651265
Type: AWS::CloudFormation::Stack
12661266
Condition: DeployEUCUtilizationModule
12671267
Properties:
1268-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-workspaces-metrics.yaml"
1268+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-workspaces-metrics.yaml"
12691269
Parameters:
12701270
DatabaseName: !Ref DatabaseName
12711271
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1291,7 +1291,7 @@ Resources:
12911291
Type: AWS::CloudFormation::Stack
12921292
Condition: DeployOrgDataModule
12931293
Properties:
1294-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-organization.yaml"
1294+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-organization.yaml"
12951295
Parameters:
12961296
DatabaseName: !Ref DatabaseName
12971297
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1312,7 +1312,7 @@ Resources:
13121312
Type: AWS::CloudFormation::Stack
13131313
Condition: DeployBudgetsModule
13141314
Properties:
1315-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-budgets.yaml"
1315+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-budgets.yaml"
13161316
Parameters:
13171317
DatabaseName: !Ref DatabaseName
13181318
DestinationBucket: !Ref S3Bucket
@@ -1333,7 +1333,7 @@ Resources:
13331333
Type: AWS::CloudFormation::Stack
13341334
Condition: DeployTransitGatewayModule
13351335
Properties:
1336-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-transit-gateway.yaml"
1336+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-transit-gateway.yaml"
13371337
Parameters:
13381338
DatabaseName: !Ref DatabaseName
13391339
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1359,7 +1359,7 @@ Resources:
13591359
Type: AWS::CloudFormation::Stack
13601360
Condition: DeployAWSFeedsModule
13611361
Properties:
1362-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-aws-feeds.yaml"
1362+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-aws-feeds.yaml"
13631363
Parameters:
13641364
DatabaseName: !Ref DatabaseName
13651365
DestinationBucket: !Ref S3Bucket
@@ -1378,7 +1378,7 @@ Resources:
13781378
Type: AWS::CloudFormation::Stack
13791379
Condition: DeployISVFeedsModule
13801380
Properties:
1381-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-isv-feeds.yaml"
1381+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-isv-feeds.yaml"
13821382
Parameters:
13831383
DatabaseName: !Ref DatabaseName
13841384
DestinationBucket: !Ref S3Bucket
@@ -1396,7 +1396,7 @@ Resources:
13961396
Type: AWS::CloudFormation::Stack
13971397
Condition: DeployHealthEventsModule
13981398
Properties:
1399-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-health-events.yaml"
1399+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-health-events.yaml"
14001400
Parameters:
14011401
DatabaseName: !Ref DatabaseName
14021402
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1418,7 +1418,7 @@ Resources:
14181418
Type: AWS::CloudFormation::Stack
14191419
Condition: DeployLicenseManagerModule
14201420
Properties:
1421-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-license-manager.yaml"
1421+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-license-manager.yaml"
14221422
Parameters:
14231423
DatabaseName: !Ref DatabaseName
14241424
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1439,7 +1439,7 @@ Resources:
14391439
Type: AWS::CloudFormation::Stack
14401440
Condition: DeployServiceQuotasModule
14411441
Properties:
1442-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-service-quotas.yaml"
1442+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-service-quotas.yaml"
14431443
Parameters:
14441444
DatabaseName: !Ref DatabaseName
14451445
DestinationBucket: !Ref S3Bucket
@@ -1465,7 +1465,7 @@ Resources:
14651465
Type: AWS::CloudFormation::Stack
14661466
Condition: DeployQuickSightModule
14671467
Properties:
1468-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-quicksight.yaml"
1468+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-quicksight.yaml"
14691469
Parameters:
14701470
DatabaseName: !Ref DatabaseName
14711471
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1484,7 +1484,7 @@ Resources:
14841484
Type: AWS::CloudFormation::Stack
14851485
Condition: DeployResilienceHubModule
14861486
Properties:
1487-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-resilience-hub.yaml"
1487+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-resilience-hub.yaml"
14881488
Parameters:
14891489
DatabaseName: !Ref DatabaseName
14901490
DestinationBucket: !Ref S3Bucket
@@ -1509,7 +1509,7 @@ Resources:
15091509
Type: AWS::CloudFormation::Stack
15101510
Condition: DeployIncludeReferenceModule
15111511
Properties:
1512-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-reference.yaml"
1512+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/module-reference.yaml"
15131513
Parameters:
15141514
DatabaseName: !Ref DatabaseName
15151515
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1533,7 +1533,7 @@ Resources:
15331533
Type: AWS::CloudFormation::Stack
15341534
Condition: DeployAccountCollector
15351535
Properties:
1536-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/account-collector.yaml"
1536+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.0/account-collector.yaml"
15371537
Parameters:
15381538
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
15391539
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.11.0/deploy/deploy-data-read-permissions.yaml
1+
# https://github.com/awslabs/cid-data-collection-framework/blob/main/data-collection/v3.12.0/deploy/deploy-data-read-permissions.yaml
22
AWSTemplateFormatVersion: '2010-09-09'
3-
Description: CID Data Collection - All-in-One for Management Account v3.11.0 - AWS Solution SO9011
3+
Description: CID Data Collection - All-in-One for Management Account v3.12.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.11.0/deploy-in-management-account.yaml"
201+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.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.11.0/deploy-in-linked-account.yaml"
218+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.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.11.0"
237+
Description: "StackSet in charge of deploying read roles across organization accounts v3.12.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.11.0/deploy-in-linked-account.yaml"
284+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.12.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.11.0
2+
Description: CID Data Collection - Role for Linked Account v3.12.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.11.0
2+
Description: CID Data Collection - Role for Management Account v3.12.0
33
Metadata:
44
AWS::CloudFormation::Interface:
55
ParameterGroups:

‎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.11.0"
2+
"version": "3.12.0"
33
}

0 commit comments

Comments
 (0)