Merge tag '3.0.0' into develop

* Upgrading to Jitsi version 2.0.8960-1
* Upgrading to devenv container
* Upgrading to Ubuntu 22.04
* Upgrading to ASG common library (changes parameter names)
* Upgrade to CDK version 2.44.0
* Adding nginx logs to CloudWatch

.gitignore

@@ -25,3 +25,6 @@ manifest.json
 # shared Makefiles/scripts
 common.mk
 scripts/common/*
+
+# plf
+plf*.xlsx

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased
 
+3.0.0
+-----
 * Upgrading to Jitsi version 2.0.8960-1
 * Upgrading to devenv container
 * Upgrading to Ubuntu 22.04

cdk/jitsi/jitsi_stack.py

@@ -31,10 +31,28 @@
 # 2) $ ave oe-patterns-dev make AMI_ID=ami-fromstep1 ami-ec2-copy
 # 3) Copy the code that copy-image generates below
 
-AMI_ID="ami-03e91903d1796a608"
-AMI_NAME="ordinary-experts-patterns-jitsi-2.2.0-7-gd023808-20231002-1014"
+# AMI list generated by:
+# make TEMPLATE_VERSION=3.0.0 ami-ec2-build
+# on Tue Oct  3 00:23:36 UTC 2023.
+AMI_ID="ami-0dab584b13e4cc80f"
+AMI_NAME="ordinary-experts-patterns-jitsi-2.2.0-11-g34d441e-20231019-0841"
 generated_ami_ids = {
-    "us-east-1": "ami-03e91903d1796a608"
+    "ap-northeast-1": "ami-XXXXXXXXXXXXXXXXX",
+    "ap-northeast-2": "ami-XXXXXXXXXXXXXXXXX",
+    "ap-south-1": "ami-XXXXXXXXXXXXXXXXX",
+    "ap-southeast-1": "ami-XXXXXXXXXXXXXXXXX",
+    "ap-southeast-2": "ami-XXXXXXXXXXXXXXXXX",
+    "ca-central-1": "ami-XXXXXXXXXXXXXXXXX",
+    "eu-central-1": "ami-XXXXXXXXXXXXXXXXX",
+    "eu-north-1": "ami-XXXXXXXXXXXXXXXXX",
+    "eu-west-1": "ami-XXXXXXXXXXXXXXXXX",
+    "eu-west-2": "ami-XXXXXXXXXXXXXXXXX",
+    "eu-west-3": "ami-XXXXXXXXXXXXXXXXX",
+    "sa-east-1": "ami-XXXXXXXXXXXXXXXXX",
+    "us-east-2": "ami-XXXXXXXXXXXXXXXXX",
+    "us-west-1": "ami-XXXXXXXXXXXXXXXXX",
+    "us-west-2": "ami-XXXXXXXXXXXXXXXXX",
+    "us-east-1": "ami-0dab584b13e4cc80f"
 }
 # End generated code block.
 
@@ -67,8 +85,7 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
             self,
             "IngressCidrBlock",
             allowed_pattern="((\d{1,3})\.){3}\d{1,3}/\d{1,2}",
-            default="0.0.0.0/0",
-            description="Required: A CIDR block to restrict access to the Jitsi application. Leave as 0.0.0.0/0 to allow public access from internet."
+            description="Required: A CIDR block to restrict access to the Jitsi application. Please set CIDR to x.x.x.x/32 to allow one specific IP address access, 0.0.0.0/0 to allow all IP addresses access, or another CIDR range."
         )
         jitsi_hostname_param = CfnParameter(
             self,
@@ -116,7 +133,7 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
         jitsi_interface_brand_watermark_link_param = CfnParameter(
             self,
             "JitsiInterfaceBrandWatermarkLink",
-            default="http://jitsi.org",
+            default="https://jitsi.org",
             description="Optional: Provide a link destination for the brand watermark logo image in the upper right corner."
         )
         jitsi_interface_watermark_param = CfnParameter(
@@ -128,7 +145,7 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
         jitsi_interface_watermark_link_param = CfnParameter(
             self,
             "JitsiInterfaceWatermarkLink",
-            default="http://jitsi.org",
+            default="https://jitsi.org",
             description="Optional: Provide a link destination for the Jitsi watermark logo image in the upper left corner."
         )
         route_53_hosted_zone_name_param = CfnParameter(
@@ -141,7 +158,7 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
             self,
             "NotificationEmail",
             default="",
-            description="Optional: Specify an email address to get emails about deploys, Let's Encrypt, and other system events."
+            description="Optional: Specify an email address for Let's Encrypt notifications."
         )
 
         #
@@ -164,14 +181,6 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
             "Vpc"
         )
 
-        # ec2
-        jitsi_sg = aws_ec2.CfnSecurityGroup(
-            self,
-            "JitsiSg",
-            group_description="Jitsi security group",
-            vpc_id=vpc.id()
-        )
-
         eip = aws_ec2.CfnEIP(
             self,
             "Eip",
@@ -257,7 +266,8 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
                         "Parameters": [
                             jitsi_hostname_param.logical_id,
                             route_53_hosted_zone_name_param.logical_id,
-                            cidr_block_param.logical_id
+                            cidr_block_param.logical_id,
+                            notification_email_param.logical_id
                         ]
                     },
                     {
@@ -280,6 +290,9 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
                     *vpc.metadata_parameter_group()
                 ],
                 "ParameterLabels": {
+                    notification_email_param.logical_id: {
+                        "default": "Notification Email"
+                    },
                     cidr_block_param.logical_id: {
                         "default": "Ingress CIDR Block"
                     },

plf_config.yaml

@@ -1,6 +1,7 @@
 ---
-# "Product ID": "OE_PATTERNS_JITSI_{{version}}"
-# "Product Code": "OE_PATTERNS_JITSI_{{version}}"
+"Product Slug": "jitsi"
+"Product ID": "ac194df3-6564-4b73-933a-99a8d35dac92"
+"Product Code": "a6sii3ist343j507uju6u0h3m"
 "Accessibility": "Public"
 "SKU": "OE_PATTERNS_JITSI"
 "Software by": "Ordinary Experts"
@@ -34,15 +35,15 @@ This template allows customization of the Jitsi Meet interface and allows Jitsi
 "Architecture": "x86_64"
 "AFI": ""
 "Operating System": "UBUNTU"
-"Operating System Version": "18.04"
+"Operating System Version": "22.04"
 "Operating System Username": "ubuntu"
 "PIOPS Total": ""
 "AWS Services Required": "Amazon EC2, Amazon VPC, Amazon IAM, Amazon SNS, Amazon CloudFormation"
 "3rd Party Software Included": "Ubuntu packages: curl git jq ntp unzip vim wget zip python-pip collectd ruby binutils git apache2 jitsi-meet, AWS CloudFormation utilities, AWS CLI, AWS CloudWatch agent."
 "Version Title": "{{version}}"
 "Release Notes": "See GitHub project for release notes."
 "Upgrade Instructions": "Re-run the stack to apply new infrastructure changes."
-"Product Access Instructions": "Run the stack. If not using the HostedZone Route53 integration, then make sure to add the appropriate DNS record so the Let's Encrypt cert can be created."
+"Product Access Instructions": "Run the stack. If not using the HostedZone Route53 integration, then make sure to add the appropriate DNS record so the Let's Encrypt cert can be created. An IAM role is provisioned as part of this product: AsgInstanceRole attached to EC2 instance and allows for association of ENIs as well as writing logs to CloudWatch logs."
 "Endpoint URL Protocol": ""
 "Endpoint URL Port": ""
 "Endpoint URL Relative URL": ""
@@ -153,7 +154,7 @@ This template allows customization of the Jitsi Meet interface and allows Jitsi
 "Clusters and AWS Resources Topology 1: Title": "Ordinary Experts Jitsi Pattern"
 "Clusters and AWS Resources Topology 1: AWS Calculator Link": "https://calculator.aws/#/estimate?id=1459d4bc50bcac9f37ced765f049b2b273885c76"
 "Clusters and AWS Resources Topology 1: Short Description": "Ordinary Experts Jitsi Pattern AWS Architecture Diagram"
-"Clusters and AWS Resources Topology 1: Long Description": "The Ordinary Experts Jitsi Patterns AWS Architecture Diagram shows the total flow of services from when the developer updates the project code to when the customer accesses the Jitsi Meet application. The diagram shows the following AWS Services: Amazon Elastic Compute Cloud (Amazon EC2), Amazon Virtual Public Cloud (Amazon VPC), and Amazon CloudWatch Logs."
+"Clusters and AWS Resources Topology 1: Long Description": "The Ordinary Experts Jitsi Patterns AWS Architecture Diagram shows the total flow of services from when the developer updates the project code to when the customer accesses the Jitsi Meet application. The diagram shows the following AWS Services: Amazon Elastic Compute Cloud (Amazon EC2), Amazon Virtual Public Cloud (Amazon VPC), and Amazon CloudWatch Logs. This product optionally collects an email address which is only used for Let's Encrypt SSL Certificate notifications."
 "Clusters and AWS Resources Topology 1: CloudFormation Template URL": "https://ordinary-experts-aws-marketplace-pattern-artifacts.s3.amazonaws.com/jitsi/{{version}}/template.yaml"
 "Clusters and AWS Resources Topology 1: Architecture Diagram URL": "https://ordinaryexperts.com/img/services/oe_jitsi_patterns_topology_diagram.png"
 "Clusters and AWS Resources Topology 2: Title": ""