diff --git a/static/Cost/200_Cost_Category/Code/Project1cfm.yml b/static/Cost/200_Cost_Category/Code/Project1cfm.yml index ea86d6ec8..2c7624566 100644 --- a/static/Cost/200_Cost_Category/Code/Project1cfm.yml +++ b/static/Cost/200_Cost_Category/Code/Project1cfm.yml @@ -396,7 +396,7 @@ Resources: - !GetAtt DatabaseSG.GroupId AllocatedStorage: '20' PubliclyAccessible: 'false' - DBInstanceClass: db.t2.micro + DBInstanceClass: db.t3.micro Engine: MySQL DBInstanceIdentifier: Project1Database MasterUsername: MyName diff --git a/static/Cost/200_Cost_Category/Code/Project2cfm.yml b/static/Cost/200_Cost_Category/Code/Project2cfm.yml index 52d65c0d2..e9d13bdf3 100644 --- a/static/Cost/200_Cost_Category/Code/Project2cfm.yml +++ b/static/Cost/200_Cost_Category/Code/Project2cfm.yml @@ -395,7 +395,7 @@ Resources: - !GetAtt DatabaseSG.GroupId AllocatedStorage: '20' PubliclyAccessible: 'false' - DBInstanceClass: db.t2.micro + DBInstanceClass: db.t3.micro Engine: MySQL DBInstanceIdentifier: Project2Database MasterUsername: MyName diff --git a/static/Cost/300_Optimization_Data_Collection/Code/source/rds_graviton_mapping.csv b/static/Cost/300_Optimization_Data_Collection/Code/source/rds_graviton_mapping.csv index 3fdfb36c6..e67f16165 100644 --- a/static/Cost/300_Optimization_Data_Collection/Code/source/rds_graviton_mapping.csv +++ b/static/Cost/300_Optimization_Data_Collection/Code/source/rds_graviton_mapping.csv @@ -39,7 +39,7 @@ Aurora,MySQL,db.r5.8xlarge,db.r6g.8xlarge Aurora,MySQL,db.r5.12xlarge,db.r6g.12xlarge Aurora,MySQL,db.r5.16xlarge,db.r6g.16xlarge Aurora,MySQL,db.r5.24xlarge,None -AmazonRDS,PostgreSQL,db.t2.micro,db.t4g.micro +AmazonRDS,PostgreSQL,db.t3.micro,db.t4g.micro AmazonRDS,PostgreSQL,db.t2.small,db.t4g.small AmazonRDS,PostgreSQL,db.t2.medium,db.t4g.medium AmazonRDS,PostgreSQL,db.t2.large,db.t4g.large @@ -99,7 +99,7 @@ AmazonRDS,PostgreSQL,db.r5b.8xlarge,db.r6gd.8xlarge AmazonRDS,PostgreSQL,db.r5b.12xlarge,db.r6gd.12xlarge AmazonRDS,PostgreSQL,db.r5b.16xlarge,db.r6gd.16xlarge AmazonRDS,PostgreSQL,db.r5b.24xlarge,None -AmazonRDS,MySQL,db.t2.micro,db.t4g.micro +AmazonRDS,MySQL,db.t3.micro,db.t4g.micro AmazonRDS,MySQL,db.t2.small,db.t4g.small AmazonRDS,MySQL,db.t2.medium,db.t4g.medium AmazonRDS,MySQL,db.t2.large,db.t4g.large @@ -159,7 +159,7 @@ AmazonRDS,MySQL,db.r5b.8xlarge,db.r6gd.8xlarge AmazonRDS,MySQL,db.r5b.12xlarge,db.r6gd.12xlarge AmazonRDS,MySQL,db.r5b.16xlarge,db.r6gd.16xlarge AmazonRDS,MySQL,db.r5b.24xlarge,None -AmazonRDS,MariaDB,db.t2.micro,db.t4g.micro +AmazonRDS,MariaDB,db.t3.micro,db.t4g.micro AmazonRDS,MariaDB,db.t2.small,db.t4g.small AmazonRDS,MariaDB,db.t2.medium,db.t4g.medium AmazonRDS,MariaDB,db.t2.large,db.t4g.large diff --git a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_app.yml b/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_app.yml index dd1763882..7322aee90 100644 --- a/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_app.yml +++ b/static/Operations/200_Automating_operations_with_playbooks_and_runbooks/Code/templates/base_app.yml @@ -291,7 +291,7 @@ Resources: Type: AWS::RDS::DBInstance Properties: AllocatedStorage: 5 - DBInstanceClass: db.t2.micro + DBInstanceClass: db.t3.micro Engine: MySQL MasterUsername: !Join ['', ['{{resolve:secretsmanager:', !Ref RDSSecret, ':SecretString:username}}' ]] MasterUserPassword: !Join ['', ['{{resolve:secretsmanager:', !Ref RDSSecret, ':SecretString:password}}' ]] diff --git a/static/Reliability/300_Testing_for_Resiliency_of_EC2_RDS_and_S3/Code/CloudFormation/mySQL_rds.json b/static/Reliability/300_Testing_for_Resiliency_of_EC2_RDS_and_S3/Code/CloudFormation/mySQL_rds.json index 389b17327..dcccd7490 100644 --- a/static/Reliability/300_Testing_for_Resiliency_of_EC2_RDS_and_S3/Code/CloudFormation/mySQL_rds.json +++ b/static/Reliability/300_Testing_for_Resiliency_of_EC2_RDS_and_S3/Code/CloudFormation/mySQL_rds.json @@ -18,7 +18,6 @@ "Description": "DB Instance Class", "Type": "String", "AllowedValues": [ - "db.t2.micro", "db.t3.micro", "db.t3.small", "db.t3.medium", @@ -32,7 +31,7 @@ "db.m5.12xlarge", "db.m5.24xlarge" ], - "Default": "db.t2.micro", + "Default": "db.t3.micro", "ConstraintDescription": "must select a valid database instance type." }, "DBUser": { diff --git a/static/Reliability/300_Testing_for_Resiliency_of_EC2_RDS_and_S3/Code/CloudFormation/mySQL_rds_readreplica.json b/static/Reliability/300_Testing_for_Resiliency_of_EC2_RDS_and_S3/Code/CloudFormation/mySQL_rds_readreplica.json index a6cab61aa..6bf96b020 100644 --- a/static/Reliability/300_Testing_for_Resiliency_of_EC2_RDS_and_S3/Code/CloudFormation/mySQL_rds_readreplica.json +++ b/static/Reliability/300_Testing_for_Resiliency_of_EC2_RDS_and_S3/Code/CloudFormation/mySQL_rds_readreplica.json @@ -33,7 +33,6 @@ "Description" : "DB Instance Class", "Type": "String", "AllowedValues": [ - "db.t2.micro", "db.t3.micro", "db.t3.small", "db.t3.medium", @@ -47,7 +46,7 @@ "db.m5.12xlarge", "db.m5.24xlarge" ], - "Default": "db.t2.micro", + "Default": "db.t3.micro", "ConstraintDescription": "must select a valid database instance type." } }, diff --git a/static/Reliability/Disaster_Recovery/Code/BackupAndRestore.yaml b/static/Reliability/Disaster_Recovery/Code/BackupAndRestore.yaml index 94fa2f0ce..5c0d2a11d 100644 --- a/static/Reliability/Disaster_Recovery/Code/BackupAndRestore.yaml +++ b/static/Reliability/Disaster_Recovery/Code/BackupAndRestore.yaml @@ -274,7 +274,7 @@ Resources: DBName: unishop DBInstanceIdentifier: !Ref 'AWS::StackName' Engine: MySQL - DBInstanceClass: db.t2.micro + DBInstanceClass: db.t3.micro Port: '3306' MasterUsername: UniShopAppV1User MasterUserPassword: UniShopAppV1Password diff --git a/static/Reliability/Disaster_Recovery/Code/BackupAndRestoreDB.yaml b/static/Reliability/Disaster_Recovery/Code/BackupAndRestoreDB.yaml index cecc4977c..b68d7a671 100644 --- a/static/Reliability/Disaster_Recovery/Code/BackupAndRestoreDB.yaml +++ b/static/Reliability/Disaster_Recovery/Code/BackupAndRestoreDB.yaml @@ -87,7 +87,7 @@ Resources: DBName: unishop DBInstanceIdentifier: !Ref 'AWS::StackName' Engine: MySQL - DBInstanceClass: db.t2.micro + DBInstanceClass: db.t3.micro Port: '3306' MasterUsername: UniShopAppV1User MasterUserPassword: UniShopAppV1Password diff --git a/static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section1/section1-base.yaml b/static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section1/section1-base.yaml index 24b05c5a6..c586ec97b 100644 --- a/static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section1/section1-base.yaml +++ b/static/Security/300_Multilayered_API_Security_with_Cognito_and_WAF/Code/templates/section1/section1-base.yaml @@ -514,7 +514,7 @@ Resources: Type: AWS::RDS::DBInstance Properties: AllocatedStorage: 20 - DBInstanceClass: db.t2.micro + DBInstanceClass: db.t3.micro DBName: !Ref RDSDBName Engine: mysql MasterUsername: !Ref RDSUserName