From 3fddf7fe873317ce18f06f23d83d8cb1f931e42d Mon Sep 17 00:00:00 2001
From: Robby Pocase <robby.pocase@canonical.com>
Date: Mon, 11 Nov 2024 09:36:27 -0600
Subject: [PATCH] feat(aws): add support options overview

This adds an overview for how to get support on AWS,
including what Pro provides, AWS frontline support,
and getting expanded support from Canonical
---
 .custom_wordlist.txt          |  2 ++
 aws/aws-reference/index.rst   |  2 ++
 aws/aws-reference/pro.rst     | 38 +++++++++++++++++++++++++++++++++++
 aws/aws-reference/support.rst | 24 ++++++++++++++++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 aws/aws-reference/pro.rst
 create mode 100644 aws/aws-reference/support.rst

diff --git a/.custom_wordlist.txt b/.custom_wordlist.txt
index 91c29ad..0ea00f4 100644
--- a/.custom_wordlist.txt
+++ b/.custom_wordlist.txt
@@ -87,6 +87,7 @@ EOL
 EOSS
 EPYC
 ESM
+esm
 ethernet
 executables
 FDE
@@ -240,6 +241,7 @@ runtimes
 rustc
 rustup
 RSA
+SaaS
 scalability
 SDK
 SeaBIOS
diff --git a/aws/aws-reference/index.rst b/aws/aws-reference/index.rst
index 22aeee0..41885e7 100644
--- a/aws/aws-reference/index.rst
+++ b/aws/aws-reference/index.rst
@@ -9,3 +9,5 @@ Technical information about some specific topics:
    Ubuntu on AWS Announcements <aws-announcements>
    EC2 credentials <ec2-credentials>
    EKS kubelet snap <eks-kubelet-snap>
+   Support options on AWS <support>
+   What does Ubuntu Pro provide <pro>
\ No newline at end of file
diff --git a/aws/aws-reference/pro.rst b/aws/aws-reference/pro.rst
new file mode 100644
index 0000000..7ad215b
--- /dev/null
+++ b/aws/aws-reference/pro.rst
@@ -0,0 +1,38 @@
+Ubuntu Pro on AWS
+-----------------
+Ubuntu Pro is a paid offering that provides expanded security coverage,
+enhanced kernel patching, and hardening options for compliance frameworks.
+All Ubuntu Pro images on Amazon receive the following support through Pro.
+
+Expanded Security Maintenance (ESM)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+`ESM archives <https://ubuntu.com/security/esm>`_ extends the security patching of
+the main archive to 10 years through the `esm-infra` entitlement. In addition
+to patching the core of Ubuntu, Pro offers security maintenance of a large
+portion of the `universe` pocket. This security coverage is considered best effort
+without Ubuntu Pro.
+
+Livepatch
+~~~~~~~~~
+`Livepatch <https://ubuntu.com/security/livepatch>`_ applies security updates
+to the kernel for critical and high security vulnerabilities to a live system.
+This provides a buffer for system administrators to minimise downtime between
+scheduled maintenance windows. This is particularly helpful for workloads
+that are expensive to migrate, such as kubernetes workers for EKS.
+
+Compliance
+~~~~~~~~~~
+Ubuntu Pro offers compliance options for users that need to apply 
+CIS (level 1 and 2) or FIPS hardening. FIPS is currently supported
+on Ubuntu 18.04 and 20.04. 22.04 is currently available through the
+`fips-preview` and `fips-updates` repositories provided through the 
+FIPS pro entitlement, but these modules are not yet certified.
+
+Ubuntu Landscape
+~~~~~~~~~~~~~~~~
+All Ubuntu Pro customers are entitled to usage of the
+`Landscape <https://ubuntu.com/landscape>_` SaaS solution.
+Landscape is an endpoint management solution for monitoring your Ubuntu
+estate. This includes alerting for security vulnerabilities, patching status,
+managing repository mirrors, and more. To sign up for Landscape SaaS see
+the `sign up page <https://landscape.canonical.com/signup>_`.
\ No newline at end of file
diff --git a/aws/aws-reference/support.rst b/aws/aws-reference/support.rst
new file mode 100644
index 0000000..70d253c
--- /dev/null
+++ b/aws/aws-reference/support.rst
@@ -0,0 +1,24 @@
+Support options on AWS
+============================
+
+Ubuntu Pro on AWS
+-----------------
+Ubuntu Pro provides numerous support options. Please see the `Pro <pro>`_ page for 
+more details.
+
+
+Amazon front line support
+-------------------------
+Canonical and Amazon collaborate on publishing Ubuntu Pro images
+through the `Amazon Web Services marketplace seller <https://aws.amazon.com/marketplace/search/results?searchTerms=ubuntu+pro&CREATOR=e6a5002c-6dd0-4d1e-8196-0a1d1857229b&filters=CREATOR>`_.
+Users of these images are able to get support directly through the
+`AWS support portal <https://console.aws.amazon.com/support/home#/case/create?issueType=technical>`_.
+
+
+Public Bug Tracker
+------------------
+The Canonical Public Cloud (CPC) team maintains a bug tracker for all cloud images. If you find
+a problem with a cloud image you case `file a bug <https://bugs.launchpad.net/cloud-images/+filebug>`_.
+When creating a bug please describe the issue, provide a minimal reproducer, and ensure you include
+which AMI you see this issue on. CPC regularly triage issues but note that support here is
+best effort.