Skip to content

Commit 5377959

Browse files
esc1144iakov-aws
esc1144
and
iakov-aws
authored
release 3.11.0 (#363)
Co-authored-by: Iakov Gan <[email protected]>
1 parent eb8ba58 commit 5377959

File tree

5 files changed

+35
-35
lines changed

5 files changed

+35
-35
lines changed

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

Lines changed: 26 additions & 26 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.10.0 - AWS Solution SO9011
3+
Description: CID Data Collection Stack v3.11.0 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -128,10 +128,10 @@ Mappings:
128128
us-west-1: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-1 }
129129
us-west-2: {CodeBucket: aws-managed-cost-intelligence-dashboards-us-west-2 }
130130
StepFunctionCode:
131-
main-state-machine: {TemplatePath: cfn/data-collection/v3.10.0/source/step-functions/main-state-machine.json}
132-
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.10.0/source/step-functions/crawler-state-machine.json}
133-
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.10.0/source/step-functions/standalone-state-machine.json}
134-
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.10.0/source/step-functions/health-detail-state-machine.json}
131+
main-state-machine: {TemplatePath: cfn/data-collection/v3.11.0/source/step-functions/main-state-machine.json}
132+
crawler-state-machine: {TemplatePath: cfn/data-collection/v3.11.0/source/step-functions/crawler-state-machine.json}
133+
standalone-state-machine: {TemplatePath: cfn/data-collection/v3.11.0/source/step-functions/standalone-state-machine.json}
134+
health-detail-state-machine: {TemplatePath: cfn/data-collection/v3.11.0/source/step-functions/health-detail-state-machine.json}
135135

136136
Parameters:
137137
DestinationBucket:
@@ -1016,7 +1016,7 @@ Resources:
10161016
Type: AWS::CloudFormation::Stack
10171017
Condition: DeployTAModule
10181018
Properties:
1019-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-trusted-advisor.yaml"
1019+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-trusted-advisor.yaml"
10201020
Parameters:
10211021
DatabaseName: !Ref DatabaseName
10221022
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1037,7 +1037,7 @@ Resources:
10371037
Type: AWS::CloudFormation::Stack
10381038
Condition: DeployRightsizingModule
10391039
Properties:
1040-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-cost-explorer-rightsizing.yaml"
1040+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-cost-explorer-rightsizing.yaml"
10411041
Parameters:
10421042
DatabaseName: !Ref DatabaseName
10431043
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1058,7 +1058,7 @@ Resources:
10581058
Type: AWS::CloudFormation::Stack
10591059
Condition: DeployCostAnomalyModule
10601060
Properties:
1061-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-cost-anomaly.yaml"
1061+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-cost-anomaly.yaml"
10621062
Parameters:
10631063
DatabaseName: !Ref DatabaseName
10641064
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1080,7 +1080,7 @@ Resources:
10801080
Type: AWS::CloudFormation::Stack
10811081
Condition: DeploySupportCasesModule
10821082
Properties:
1083-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-support-cases.yaml"
1083+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-support-cases.yaml"
10841084
Parameters:
10851085
DatabaseName: !Ref DatabaseName
10861086
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1101,7 +1101,7 @@ Resources:
11011101
Type: AWS::CloudFormation::Stack
11021102
Condition: DeployBackupModule
11031103
Properties:
1104-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-backup.yaml"
1104+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-backup.yaml"
11051105
Parameters:
11061106
DatabaseName: !Ref DatabaseName
11071107
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1122,7 +1122,7 @@ Resources:
11221122
Type: AWS::CloudFormation::Stack
11231123
Condition: DeployInventoryCollectorModule
11241124
Properties:
1125-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-inventory.yaml"
1125+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-inventory.yaml"
11261126
Parameters:
11271127
DatabaseName: !Ref DatabaseName
11281128
DestinationBucket: !Ref S3Bucket
@@ -1149,7 +1149,7 @@ Resources:
11491149
Type: AWS::CloudFormation::Stack
11501150
Condition: DeployPricingModule
11511151
Properties:
1152-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-pricing.yaml"
1152+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-pricing.yaml"
11531153
Parameters:
11541154
DatabaseName: !Ref DatabaseName
11551155
DestinationBucket: !Ref S3Bucket
@@ -1172,7 +1172,7 @@ Resources:
11721172
Type: AWS::CloudFormation::Stack
11731173
Condition: DeployComputeOptimizerModule
11741174
Properties:
1175-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-compute-optimizer.yaml"
1175+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-compute-optimizer.yaml"
11761176
Parameters:
11771177
DestinationBucket: !Ref S3Bucket
11781178
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
@@ -1197,7 +1197,7 @@ Resources:
11971197
Type: AWS::CloudFormation::Stack
11981198
Condition: DeployEcsChargebackModule
11991199
Properties:
1200-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-ecs-chargeback.yaml"
1200+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-ecs-chargeback.yaml"
12011201
Parameters:
12021202
DatabaseName: !Ref DatabaseName
12031203
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1223,7 +1223,7 @@ Resources:
12231223
Type: AWS::CloudFormation::Stack
12241224
Condition: DeployRDSUtilizationModule
12251225
Properties:
1226-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-rds-usage.yaml"
1226+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-rds-usage.yaml"
12271227
Parameters:
12281228
DatabaseName: !Ref DatabaseName
12291229
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1249,7 +1249,7 @@ Resources:
12491249
Type: AWS::CloudFormation::Stack
12501250
Condition: DeployEUCUtilizationModule
12511251
Properties:
1252-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-workspaces-metrics.yaml"
1252+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-workspaces-metrics.yaml"
12531253
Parameters:
12541254
DatabaseName: !Ref DatabaseName
12551255
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1275,7 +1275,7 @@ Resources:
12751275
Type: AWS::CloudFormation::Stack
12761276
Condition: DeployOrgDataModule
12771277
Properties:
1278-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-organization.yaml"
1278+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-organization.yaml"
12791279
Parameters:
12801280
DatabaseName: !Ref DatabaseName
12811281
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1296,7 +1296,7 @@ Resources:
12961296
Type: AWS::CloudFormation::Stack
12971297
Condition: DeployBudgetsModule
12981298
Properties:
1299-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-budgets.yaml"
1299+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-budgets.yaml"
13001300
Parameters:
13011301
DatabaseName: !Ref DatabaseName
13021302
DestinationBucket: !Ref S3Bucket
@@ -1317,7 +1317,7 @@ Resources:
13171317
Type: AWS::CloudFormation::Stack
13181318
Condition: DeployTransitGatewayModule
13191319
Properties:
1320-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-transit-gateway.yaml"
1320+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-transit-gateway.yaml"
13211321
Parameters:
13221322
DatabaseName: !Ref DatabaseName
13231323
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1343,7 +1343,7 @@ Resources:
13431343
Type: AWS::CloudFormation::Stack
13441344
Condition: DeployAWSFeedsModule
13451345
Properties:
1346-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-aws-feeds.yaml"
1346+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-aws-feeds.yaml"
13471347
Parameters:
13481348
DatabaseName: !Ref DatabaseName
13491349
DestinationBucket: !Ref S3Bucket
@@ -1362,7 +1362,7 @@ Resources:
13621362
Type: AWS::CloudFormation::Stack
13631363
Condition: DeployISVFeedsModule
13641364
Properties:
1365-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-isv-feeds.yaml"
1365+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-isv-feeds.yaml"
13661366
Parameters:
13671367
DatabaseName: !Ref DatabaseName
13681368
DestinationBucket: !Ref S3Bucket
@@ -1380,7 +1380,7 @@ Resources:
13801380
Type: AWS::CloudFormation::Stack
13811381
Condition: DeployHealthEventsModule
13821382
Properties:
1383-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-health-events.yaml"
1383+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-health-events.yaml"
13841384
Parameters:
13851385
DatabaseName: !Ref DatabaseName
13861386
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1402,7 +1402,7 @@ Resources:
14021402
Type: AWS::CloudFormation::Stack
14031403
Condition: DeployLicenseManagerModule
14041404
Properties:
1405-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-license-manager.yaml"
1405+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-license-manager.yaml"
14061406
Parameters:
14071407
DatabaseName: !Ref DatabaseName
14081408
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1423,7 +1423,7 @@ Resources:
14231423
Type: AWS::CloudFormation::Stack
14241424
Condition: DeployServiceQuotasModule
14251425
Properties:
1426-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-service-quotas.yaml"
1426+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-service-quotas.yaml"
14271427
Parameters:
14281428
DatabaseName: !Ref DatabaseName
14291429
DestinationBucket: !Ref S3Bucket
@@ -1449,7 +1449,7 @@ Resources:
14491449
Type: AWS::CloudFormation::Stack
14501450
Condition: DeployQuickSightModule
14511451
Properties:
1452-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/module-quicksight.yaml"
1452+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/module-quicksight.yaml"
14531453
Parameters:
14541454
DatabaseName: !Ref DatabaseName
14551455
DataBucketsKmsKeysArns: !Ref DataBucketsKmsKeysArns
@@ -1468,7 +1468,7 @@ Resources:
14681468
Type: AWS::CloudFormation::Stack
14691469
Condition: DeployAccountCollector
14701470
Properties:
1471-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/account-collector.yaml"
1471+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/account-collector.yaml"
14721472
Parameters:
14731473
ManagementRoleName: !Sub "${ResourcePrefix}${ManagementAccountRole}"
14741474
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.10.0/deploy/deploy-data-read-permissions.yaml
1+
# https://github.com/awslabs/cid-data-collection-framework/blob/main/data-collection/v3.11.0/deploy/deploy-data-read-permissions.yaml
22
AWSTemplateFormatVersion: '2010-09-09'
3-
Description: CID Data Collection - All-in-One for Management Account v3.10.0 - AWS Solution SO9011
3+
Description: CID Data Collection - All-in-One for Management Account v3.11.0 - AWS Solution SO9011
44
Metadata:
55
AWS::CloudFormation::Interface:
66
ParameterGroups:
@@ -190,7 +190,7 @@ Resources:
190190
DataCollectorMgmtAccountReadStack:
191191
Type: AWS::CloudFormation::Stack
192192
Properties:
193-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/deploy-in-management-account.yaml"
193+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/deploy-in-management-account.yaml"
194194
Parameters:
195195
DataCollectionAccountID: !Ref DataCollectionAccountID
196196
ManagementAccountRole: !Ref ManagementAccountRole
@@ -206,7 +206,7 @@ Resources:
206206
Type: AWS::CloudFormation::Stack
207207
Condition: DeployModuleReadInMgmt
208208
Properties:
209-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/deploy-in-linked-account.yaml"
209+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.0/deploy-in-linked-account.yaml"
210210
Parameters:
211211
DataCollectionAccountID: !Ref DataCollectionAccountID
212212
MultiAccountRoleName: !Ref MultiAccountRoleName
@@ -223,7 +223,7 @@ Resources:
223223
DataCollectorOrgAccountModulesReadStackSet:
224224
Type: AWS::CloudFormation::StackSet
225225
Properties:
226-
Description: "StackSet in charge of deploying read roles across organization accounts v3.10.0"
226+
Description: "StackSet in charge of deploying read roles across organization accounts v3.11.0"
227227
PermissionModel: SERVICE_MANAGED
228228
AutoDeployment:
229229
Enabled: true
@@ -268,4 +268,4 @@ Resources:
268268
- CAPABILITY_IAM
269269
- CAPABILITY_NAMED_IAM
270270
StackSetName: !Sub "StackSet-${AWS::AccountId}-OptimizationDataRole"
271-
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.10.0/deploy-in-linked-account.yaml"
271+
TemplateURL: !Sub "https://${CFNSourceBucket}.s3.${AWS::URLSuffix}/cfn/data-collection/v3.11.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.10.0
2+
Description: CID Data Collection - Role for Linked Account v3.11.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.10.0
2+
Description: CID Data Collection - Role for Management Account v3.11.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.10.0"
2+
"version": "3.11.0"
33
}

0 commit comments

Comments
 (0)