diff --git a/CHANGELOG.MD b/CHANGELOG.MD index ffe6f22..73623ce 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -2,6 +2,20 @@ # Change Log All notable changes to this project will be documented in this file. +## [2.3.0] - 2021-03-10 + +### Upgrade Notes: +- Upgrading the Amazon Aurora Postgres Engine version via Amazon Cloudformation is not supported. Please refer to the official [upgrade documentation](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_UpgradeDBInstance.PostgreSQL.html) if you have a already running environment using an older engine version to proceed with the upgrade before reruning the Cloudformation deployment with default parameters. +Alternatively you can set the parameter 'BBBDBEngineVersion' to the version you're currently using to prevent Amazon Cloudformation to try to upgrade. + +### Added +- #62: HTTP to HTTPS rewrites implemented +- #66: Added parameters to set the Big Blue Button application server root volume size + +### Changed +- #63: default Amazon Aurora Postgres engine version updated to 12.4 +- Updated Architectural Diagram for Serverless + ## [2.2.0] - 2021-01-07 ### Fixes diff --git a/README.md b/README.md index 3e3d25f..b9a7fec 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,7 @@ The deployment parameters are placed into the bbb-on-aws-param.json or to be set | BBBECSInstanceType| t3a.large| Instance size of the ECS Cluster worker nodes or "fargate" for serverless deployment | EC2 instance sizes should be aligned with the size VCPU and Memory limits of the to be deployed tasks. setting this parameter to fargate will cause a Serverless Setup using AWS Fargate | | BBBApplicationInstanceType| t3a.xlarge| Instance size of the Big Blue Button Application node(s) | please refer to the Big Blue Button [Documentation](https://docs.bigbluebutton.org/2.2/install.html#minimum-server-requirements) for rightsizing | | BBBApplicationDataVolumeSize | 20 | the size of the application data volume used for recording buffer | +| BBBApplicationRootVolumeSize | 20 | the size of the application root volume | | BBBTurnInstanceType| t3.micro| Instance size of the turn server | For right sizing please refer to the Big Blue Button [Documentation](https://docs.bigbluebutton.org/2.2/setup-turn-server.html) | BBBDBInstanceType| db.t3.medium| Instance size of the Aurora Database Instance or "serverless" for serverless deployment | Heavily related to usage, collect metrics and test. | BBBCACHEDBInstanceType| cache.t3.micro| Instance size of the Redis security token and call ID handling | Depends on usage. diff --git a/bbb-on-aws-master.template.yaml b/bbb-on-aws-master.template.yaml index 04d51df..31664ca 100644 --- a/bbb-on-aws-master.template.yaml +++ b/bbb-on-aws-master.template.yaml @@ -235,6 +235,10 @@ Parameters: Description: Size of the application instance data volume Type: Number Default: 50 + BBBApplicationRootVolumeSize: + Description: Size of the application instance data volume + Type: Number + Default: 20 BBBTurnInstanceType: Description: Instance type for the turn server Type: String @@ -836,6 +840,8 @@ Resources: - Outputs.BBBTurnAMIParameter BBBEnvironmentStage: Ref: BBBEnvironmentStage + BBBEnvironmentType: + Ref: BBBEnvironmentType BBBTurnInstanceType: Ref: BBBTurnInstanceType BBBTurnMaxInstances: @@ -932,6 +938,8 @@ Resources: Ref: BBBApplicationInstanceType BBBApplicationDataVolumeSize: Ref: BBBApplicationDataVolumeSize + BBBApplicationRootVolumeSize: + Ref: BBBApplicationRootVolumeSize BBBApplicationMaxInstances: Ref: BBBApplicationMaxInstances BBBApplicationMinInstances: @@ -1031,6 +1039,8 @@ Resources: Ref: BBBApplicationInstanceType BBBApplicationDataVolumeSize: Ref: BBBApplicationDataVolumeSize + BBBApplicationRootVolumeSize: + Ref: BBBApplicationRootVolumeSize BBBApplicationMaxInstances: Ref: BBBApplicationMaxInstances BBBApplicationMinInstances: diff --git a/bbb-on-aws-param.json b/bbb-on-aws-param.json index 5e19528..76bf655 100755 --- a/bbb-on-aws-param.json +++ b/bbb-on-aws-param.json @@ -6,6 +6,7 @@ "BBBECSInstanceType": "t3a.medium", "BBBApplicationInstanceType": "t3a.medium", "BBBApplicationDataVolumeSize": 50, + "BBBApplicationRootVolumeSize": 20, "BBBTurnInstanceType": "t3a.micro", "BBBDBInstanceType": "db.t3.medium", "BBBServerlessAuroraMinCapacity": 2, diff --git a/documentation/BBBArchitectureDiagramServerless.png b/documentation/BBBArchitectureDiagramServerless.png index 9dec0f3..aa42774 100644 Binary files a/documentation/BBBArchitectureDiagramServerless.png and b/documentation/BBBArchitectureDiagramServerless.png differ diff --git a/documentation/BBBArchitectureDiagramServerless.xml b/documentation/BBBArchitectureDiagramServerless.xml deleted file mode 100644 index 5ad0d95..0000000 --- a/documentation/BBBArchitectureDiagramServerless.xml +++ /dev/null @@ -1 +0,0 @@ -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 \ No newline at end of file diff --git a/templates/bbb-on-aws-bbbappscalable.template.yaml b/templates/bbb-on-aws-bbbappscalable.template.yaml index 7a84ecc..b0014ed 100644 --- a/templates/bbb-on-aws-bbbappscalable.template.yaml +++ b/templates/bbb-on-aws-bbbappscalable.template.yaml @@ -96,6 +96,10 @@ Parameters: Description: Size of the application instance data volume Type: Number Default: 20 + BBBApplicationRootVolumeSize: + Description: Size of the application instance data volume + Type: Number + Default: 20 BBBApplicationMaxInstances: Type: Number Description: Maximum number of appserver instances @@ -278,7 +282,7 @@ Resources: - DeviceName: /dev/sda1 Ebs: VolumeType: gp2 - VolumeSize: 20 + VolumeSize: !Ref BBBApplicationRootVolumeSize Encrypted: true - DeviceName: /dev/sdf Ebs: diff --git a/templates/bbb-on-aws-bbbappsingle.template.yaml b/templates/bbb-on-aws-bbbappsingle.template.yaml index 71aa6b6..43d9d68 100644 --- a/templates/bbb-on-aws-bbbappsingle.template.yaml +++ b/templates/bbb-on-aws-bbbappsingle.template.yaml @@ -90,6 +90,10 @@ Parameters: Description: Size of the application instance data volume Type: Number Default: 20 + BBBApplicationRootVolumeSize: + Description: Size of the application instance data volume + Type: Number + Default: 20 BBBApplicationMaxInstances: Type: Number Description: Maximum number of appserver instances @@ -245,7 +249,7 @@ Resources: BlockDeviceMappings: - DeviceName: "/dev/sda1" Ebs: - VolumeSize: 20 + VolumeSize: !Ref BBBApplicationRootVolumeSize VolumeType: gp2 Encrypted: true - DeviceName: /dev/sdf diff --git a/templates/bbb-on-aws-bbbturn.template.yaml b/templates/bbb-on-aws-bbbturn.template.yaml index ec491bd..6e5eabf 100644 --- a/templates/bbb-on-aws-bbbturn.template.yaml +++ b/templates/bbb-on-aws-bbbturn.template.yaml @@ -105,6 +105,12 @@ Parameters: - stage - prod - dev + BBBEnvironmentType: + Description: 'Defines the environment type. Allowed values: scalable, single' + Type: String + AllowedValues: + - scalable + - single BBBTurnSecurityGroup: Description: Security Group that should be assigned for the turn server Type: String