Skip to content

Commit fae8bcd

Browse files
iakov-awsiakov-aws
authored
Merge pull request #396 from aws-solutions-library-samples/release/3.14.1
release 3.14.1
2 parents 5f82309 + ab2d279 commit fae8bcd

File tree

6 files changed

+39
-39
lines changed

6 files changed

+39
-39
lines changed

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

Lines changed: 29 additions & 29 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.14.0 - AWS Solution SO9011
3+
Description: CID Data Collection Stack v3.14.1 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -135,10 +135,10 @@ Mappings:
135135
us-west-1: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-1 }
136136
us-west-2: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-2 }
137137
StepFunctionCode:
138-
main-state-machine: {TemplatePath: cfn/data-collection/v3.14.0/source/step-functions/main-state-machine.json}
139-
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.14.0/source/step-functions/crawler-state-machine.json}
140-
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.14.0/source/step-functions/standalone-state-machine.json}
141-
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.14.0/source/step-functions/health-detail-state-machine.json}
138+
main-state-machine: {TemplatePath: cfn/data-collection/v3.14.1/source/step-functions/main-state-machine.json}
139+
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.14.1/source/step-functions/crawler-state-machine.json}
140+
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.14.1/source/step-functions/standalone-state-machine.json}
141+
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.14.1/source/step-functions/health-detail-state-machine.json}
142142

143143
Parameters:
144144
DestinationBucket:
@@ -1042,7 +1042,7 @@ Resources:
10421042
Type: AWS::CloudFormation::Stack
10431043
Condition: DeployTAModule
10441044
Properties:
1045-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-trusted-advisor.yaml"
1045+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-trusted-advisor.yaml"
10461046
Parameters:
10471047
DatabaseName: !Ref DatabaseName
10481048
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1064,7 +1064,7 @@ Resources:
10641064
Type: AWS::CloudFormation::Stack
10651065
Condition: DeployRightsizingModule
10661066
Properties:
1067-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-cost-explorer-rightsizing.yaml"
1067+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-cost-explorer-rightsizing.yaml"
10681068
Parameters:
10691069
DatabaseName: !Ref DatabaseName
10701070
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1085,7 +1085,7 @@ Resources:
10851085
Type: AWS::CloudFormation::Stack
10861086
Condition: DeployCostAnomalyModule
10871087
Properties:
1088-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-cost-anomaly.yaml"
1088+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-cost-anomaly.yaml"
10891089
Parameters:
10901090
DatabaseName: !Ref DatabaseName
10911091
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1107,7 +1107,7 @@ Resources:
11071107
Type: AWS::CloudFormation::Stack
11081108
Condition: DeploySupportCasesModule
11091109
Properties:
1110-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-support-cases.yaml"
1110+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-support-cases.yaml"
11111111
Parameters:
11121112
DatabaseName: !Ref DatabaseName
11131113
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1128,7 +1128,7 @@ Resources:
11281128
Type: AWS::CloudFormation::Stack
11291129
Condition: DeployBackupModule
11301130
Properties:
1131-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-backup.yaml"
1131+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-backup.yaml"
11321132
Parameters:
11331133
DatabaseName: !Ref DatabaseName
11341134
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1149,7 +1149,7 @@ Resources:
11491149
Type: AWS::CloudFormation::Stack
11501150
Condition: DeployInventoryCollectorModule
11511151
Properties:
1152-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-inventory.yaml"
1152+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-inventory.yaml"
11531153
Parameters:
11541154
DatabaseName: !Ref DatabaseName
11551155
DestinationBucket: !Ref S3Bucket
@@ -1176,7 +1176,7 @@ Resources:
11761176
Type: AWS::CloudFormation::Stack
11771177
Condition: DeployPricingModule
11781178
Properties:
1179-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-pricing.yaml"
1179+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-pricing.yaml"
11801180
Parameters:
11811181
DatabaseName: !Ref DatabaseName
11821182
DestinationBucket: !Ref S3Bucket
@@ -1199,7 +1199,7 @@ Resources:
11991199
Type: AWS::CloudFormation::Stack
12001200
Condition: DeployComputeOptimizerModule
12011201
Properties:
1202-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-compute-optimizer.yaml"
1202+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-compute-optimizer.yaml"
12031203
Parameters:
12041204
DestinationBucket: !Ref S3Bucket
12051205
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
@@ -1224,7 +1224,7 @@ Resources:
12241224
Type: AWS::CloudFormation::Stack
12251225
Condition: DeployEcsChargebackModule
12261226
Properties:
1227-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-ecs-chargeback.yaml"
1227+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-ecs-chargeback.yaml"
12281228
Parameters:
12291229
DatabaseName: !Ref DatabaseName
12301230
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1250,7 +1250,7 @@ Resources:
12501250
Type: AWS::CloudFormation::Stack
12511251
Condition: DeployRDSUtilizationModule
12521252
Properties:
1253-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-rds-usage.yaml"
1253+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-rds-usage.yaml"
12541254
Parameters:
12551255
DatabaseName: !Ref DatabaseName
12561256
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1276,7 +1276,7 @@ Resources:
12761276
Type: AWS::CloudFormation::Stack
12771277
Condition: DeployEUCUtilizationModule
12781278
Properties:
1279-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-workspaces-metrics.yaml"
1279+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-workspaces-metrics.yaml"
12801280
Parameters:
12811281
DatabaseName: !Ref DatabaseName
12821282
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1302,7 +1302,7 @@ Resources:
13021302
Type: AWS::CloudFormation::Stack
13031303
Condition: DeployOrgDataModule
13041304
Properties:
1305-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-organization.yaml"
1305+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-organization.yaml"
13061306
Parameters:
13071307
DatabaseName: !Ref DatabaseName
13081308
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1323,7 +1323,7 @@ Resources:
13231323
Type: AWS::CloudFormation::Stack
13241324
Condition: DeployBudgetsModule
13251325
Properties:
1326-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-budgets.yaml"
1326+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-budgets.yaml"
13271327
Parameters:
13281328
DatabaseName: !Ref DatabaseName
13291329
DestinationBucket: !Ref S3Bucket
@@ -1344,7 +1344,7 @@ Resources:
13441344
Type: AWS::CloudFormation::Stack
13451345
Condition: DeployTransitGatewayModule
13461346
Properties:
1347-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-transit-gateway.yaml"
1347+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-transit-gateway.yaml"
13481348
Parameters:
13491349
DatabaseName: !Ref DatabaseName
13501350
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1370,7 +1370,7 @@ Resources:
13701370
Type: AWS::CloudFormation::Stack
13711371
Condition: DeployAWSFeedsModule
13721372
Properties:
1373-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-aws-feeds.yaml"
1373+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-aws-feeds.yaml"
13741374
Parameters:
13751375
DatabaseName: !Ref DatabaseName
13761376
DestinationBucket: !Ref S3Bucket
@@ -1389,7 +1389,7 @@ Resources:
13891389
Type: AWS::CloudFormation::Stack
13901390
Condition: DeployISVFeedsModule
13911391
Properties:
1392-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-isv-feeds.yaml"
1392+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-isv-feeds.yaml"
13931393
Parameters:
13941394
DatabaseName: !Ref DatabaseName
13951395
DestinationBucket: !Ref S3Bucket
@@ -1407,7 +1407,7 @@ Resources:
14071407
Type: AWS::CloudFormation::Stack
14081408
Condition: DeployHealthEventsModule
14091409
Properties:
1410-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-health-events.yaml"
1410+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-health-events.yaml"
14111411
Parameters:
14121412
DatabaseName: !Ref DatabaseName
14131413
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1429,7 +1429,7 @@ Resources:
14291429
Type: AWS::CloudFormation::Stack
14301430
Condition: DeployLicenseManagerModule
14311431
Properties:
1432-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-license-manager.yaml"
1432+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-license-manager.yaml"
14331433
Parameters:
14341434
DatabaseName: !Ref DatabaseName
14351435
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1450,7 +1450,7 @@ Resources:
14501450
Type: AWS::CloudFormation::Stack
14511451
Condition: DeployServiceQuotasModule
14521452
Properties:
1453-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-service-quotas.yaml"
1453+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-service-quotas.yaml"
14541454
Parameters:
14551455
DatabaseName: !Ref DatabaseName
14561456
DestinationBucket: !Ref S3Bucket
@@ -1476,7 +1476,7 @@ Resources:
14761476
Type: AWS::CloudFormation::Stack
14771477
Condition: DeployQuickSightModule
14781478
Properties:
1479-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-quicksight.yaml"
1479+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-quicksight.yaml"
14801480
Parameters:
14811481
DatabaseName: !Ref DatabaseName
14821482
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1495,7 +1495,7 @@ Resources:
14951495
Type: AWS::CloudFormation::Stack
14961496
Condition: DeployResilienceHubModule
14971497
Properties:
1498-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-resilience-hub.yaml"
1498+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-resilience-hub.yaml"
14991499
Parameters:
15001500
DatabaseName: !Ref DatabaseName
15011501
DestinationBucket: !Ref S3Bucket
@@ -1520,7 +1520,7 @@ Resources:
15201520
Type: AWS::CloudFormation::Stack
15211521
Condition: DeployMarketplaceModule
15221522
Properties:
1523-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-marketplace.yaml"
1523+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-marketplace.yaml"
15241524
Parameters:
15251525
DatabaseName: !Ref DatabaseName
15261526
DestinationBucket: !Ref S3Bucket
@@ -1546,7 +1546,7 @@ Resources:
15461546
Type: AWS::CloudFormation::Stack
15471547
Condition: DeployIncludeReferenceModule
15481548
Properties:
1549-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/module-reference.yaml"
1549+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/module-reference.yaml"
15501550
Parameters:
15511551
DatabaseName: !Ref DatabaseName
15521552
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1570,7 +1570,7 @@ Resources:
15701570
Type: AWS::CloudFormation::Stack
15711571
Condition: DeployAccountCollector
15721572
Properties:
1573-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/account-collector.yaml"
1573+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/account-collector.yaml"
15741574
Parameters:
15751575
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
15761576
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.14.0/deploy/deploy-data-read-permissions.yaml
1+
# https://github.com/awslabs/cid-data-collection-framework/blob/main/data-collection/v3.14.1/deploy/deploy-data-read-permissions.yaml
22
AWSTemplateFormatVersion: '2010-09-09'
3-
Description: CID Data Collection - All-in-One for Management Account v3.14.0 - AWS Solution SO9011
3+
Description: CID Data Collection - All-in-One for Management Account v3.14.1 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -206,7 +206,7 @@ Resources:
206206
DataCollectorMgmtAccountReadStack:
207207
Type: AWS::CloudFormation::Stack
208208
Properties:
209-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/deploy-in-management-account.yaml"
209+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/deploy-in-management-account.yaml"
210210
Parameters:
211211
DataCollectionAccountID: !Ref DataCollectionAccountID
212212
ManagementAccountRole: !Ref ManagementAccountRole
@@ -223,7 +223,7 @@ Resources:
223223
Type: AWS::CloudFormation::Stack
224224
Condition: DeployModuleReadInMgmt
225225
Properties:
226-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/deploy-in-linked-account.yaml"
226+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/deploy-in-linked-account.yaml"
227227
Parameters:
228228
DataCollectionAccountID: !Ref DataCollectionAccountID
229229
MultiAccountRoleName: !Ref MultiAccountRoleName
@@ -243,7 +243,7 @@ Resources:
243243
DataCollectorOrgAccountModulesReadStackSet:
244244
Type: AWS::CloudFormation::StackSet
245245
Properties:
246-
Description: "StackSet in charge of deploying read roles across organization accounts v3.14.0"
246+
Description: "StackSet in charge of deploying read roles across organization accounts v3.14.1"
247247
PermissionModel: SERVICE_MANAGED
248248
AutoDeployment:
249249
Enabled: true
@@ -292,4 +292,4 @@ Resources:
292292
- CAPABILITY_IAM
293293
- CAPABILITY_NAMED_IAM
294294
StackSetName: !Sub "StackSet-${AWS::AccountId}-OptimizationDataRole"
295-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.0/deploy-in-linked-account.yaml"
295+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.14.1/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.14.0
2+
Description: CID Data Collection - Role for Linked Account v3.14.1
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.14.0
2+
Description: CID Data Collection - Role for Management Account v3.14.1
33
Metadata:
44
cfn-lint:
55
config:

‎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.14.0"
20+
"STACK_VERSION": "v3.14.1"
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.14.0"
2+
"version": "3.14.1"
33
}

0 commit comments

Comments
 (0)