Update CIS control mapping

Author: jomolesk

articles/governance/blueprints/samples/cis-azure-1.1.0/control-mapping.md

@@ -36,7 +36,7 @@ This blueprint assigns [Azure Policy](../../../policy/overview.md) definitions t
 when multi-factor authentication isn't enabled on privileged Azure Active Directory accounts.
 
 - MFA should be enabled on accounts with owner permissions on your subscription
-- MFA should be enabled on accounts with write permissions on your subscription
+- MFA should be enabled accounts with write permissions on your subscription
 
 ## 1.2 Ensure that multi-factor authentication is enabled for all non-privileged users
 
@@ -51,9 +51,9 @@ accounts.
 This blueprint assigns [Azure Policy](../../../policy/overview.md) definitions that help you monitor
 for guest accounts that may need removed.
 
-- External accounts with owner permissions should be removed from your subscription
 - External accounts with read permissions should be removed from your subscription
 - External accounts with write permissions should be removed from your subscription
+- External accounts with owner permissions should be removed from your subscription
 
 ## 1.23 Ensure that no custom subscription owner roles are created
 
@@ -67,7 +67,7 @@ for custom subscription owner roles that may need removed.
 This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
 monitor networks and virtual machines where the Security Center standard tier isn't enabled.
 
- - Security Center standard pricing tier should be selected
+- Security Center standard pricing tier should be selected
 
 ## 2.2 Ensure that 'Automatic provisioning of monitoring agent' is set to 'On'
 
@@ -109,14 +109,7 @@ ensure virtual machine disks are encrypted.
 This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
 protect Internet-facing virtual machines.
 
-- Network Security Group Rules for Internet facing virtual machines should be hardened
-
-## 2.8 Ensure ASC Default policy setting "Monitor Web Application Firewall" is not "Disabled"
-
-This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
-protect virtual machines running web applications.
-
-- The NSGs rules for web applications on IaaS should be hardened
+- Adaptive Network Hardening recommendations should be applied on internet facing virtual machines
 
 ## 2.9 Ensure ASC Default policy setting "Enable Next Generation Firewall(NGFW) Monitoring" is not "Disabled"
 
@@ -126,7 +119,7 @@ referenced by this CIS Microsoft Azure Foundations Benchmark recommendation has
 new recommendations. The policies referenced below address the new recommendations.
 
 - Subnets should be associated with a Network Security Group
-- Virtual machines should be associated with a Network Security Group
+- Internet-facing virtual machines should be protected with Network Security Groups
 
 ## 2.10 Ensure ASC Default policy setting "Monitor Vulnerability Assessment" is not "Disabled"
 
@@ -159,7 +152,7 @@ ensure Adaptive Application Controls is enabled on virtual machines.
 This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps ensure
 SQL server auditing is enabled.
 
-- Auditing should be enabled on advanced data security settings on SQL Server
+- Auditing on SQL server should be enabled
 
 ## 2.15 Ensure ASC Default policy setting "Monitor SQL Encryption" is not "Disabled"
 
@@ -222,7 +215,7 @@ monitor storage accounts that don't allow access from trusted Microsoft services
 This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps ensure
 SQL server auditing is enabled. 
 
-- Auditing should be enabled on advanced data security settings on SQL Server
+- Auditing on SQL server should be enabled
 
 ## 4.2 Ensure that 'AuditActionGroups' in 'auditing' policy for a SQL server is set properly
 
@@ -243,38 +236,32 @@ ensure SQL server logs are retained for at least 90 days.
 This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
 ensure advanced data security is enabled on SQL servers and SQL managed instances.
 
-- Advanced data security should be enabled on your SQL managed instances
 - Advanced data security should be enabled on your SQL servers
+- Advanced data security should be enabled on your SQL managed instances
 
 ## 4.5 Ensure that 'Threat Detection types' is set to 'All'
 
 This blueprint assigns [Azure Policy](../../../policy/overview.md) definitions that help you ensure
 advanced threat protection is properly configured on SQL servers and SQL managed instances.
 
-- Advanced Threat Protection types should be set to 'All' in SQL server Advanced Data Security
-  settings
-- Advanced Threat Protection types should be set to 'All' in SQL managed instance Advanced Data
-  Security settings
+- Advanced Threat Protection types should be set to 'All' in SQL server Advanced Data Security settings
+- Advanced Threat Protection types should be set to 'All' in SQL managed instance Advanced Data Security settings
 
 ## 4.6 Ensure that 'Send alerts to' is set
 
 This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
 ensure advanced data security notifications are properly enabled.
 
-- Advanced data security settings for SQL managed instance should contain an email address to
-  receive security alerts
-- Advanced data security settings for SQL server should contain an email address to receive security
-  alerts
+- Advanced data security settings for SQL server should contain an email address to receive security alerts
+- Advanced data security settings for SQL managed instance should contain an email address to receive security alerts
 
 ## 4.7 Ensure that 'Email service and co-administrators' is 'Enabled'
 
 This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
 ensure advanced data security notifications are properly enabled.
 
-- Email notifications to admins and subscription owners should be enabled in SQL managed instance
-  advanced data security settings
-- Email notifications to admins and subscription owners should be enabled in SQL server advanced
-  data security settings
+- Email notifications to admins and subscription owners should be enabled in SQL server advanced data security settings
+- Email notifications to admins and subscription owners should be enabled in SQL managed instance advanced data security settings
 
 ## 4.8 Ensure that Azure Active Directory Admin is configured
 
@@ -296,8 +283,8 @@ This blueprint assigns [Azure Policy](../../../policy/overview.md) definitions t
 the transparent data encrypted protector for SQL servers and SQL managed instances is encrypted with
 your own key.
 
-- SQL managed instance TDE protector should be encrypted with your own key
 - SQL server TDE protector should be encrypted with your own key
+- SQL managed instance TDE protector should be encrypted with your own key
 
 ## 4.11 Ensure 'Enforce SSL connection' is set to 'ENABLED' for MySQL Database Server
 
@@ -385,13 +372,97 @@ ensure that the log profile is properly configured.
 
 - Azure Monitor should collect activity logs from all regions
 
+## 5.1.6 Ensure the storage account containing the container with activity logs is encrypted with BYOK (Use Your Own Key)
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that storage accounts containing activity logs are encrypted with BYOK.
+
+- Storage account containing the container with activity logs must be encrypted with BYOK
+
 ## 5.1.7 Ensure that logging for Azure KeyVault is 'Enabled'
 
 This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
 ensure diagnostic logs are enabled for key vaults.
 
 - Diagnostic logs in Key Vault should be enabled
 
+## 5.2.1 Ensure that Activity Log Alert exists for Create Policy Assignment
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that specific activity log alerts exists.
+
+- An activity log alert should exist for specific Policy operations
+
+## 5.2.2 Ensure that Activity Log Alert exists for Create or Update Network Security Group
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that specific activity log alerts exists.
+
+- An activity log alert should exist for specific Administrative operations
+
+## 5.2.3 Ensure that Activity Log Alert exists for Delete Network Security Group
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that specific activity log alerts exists.
+
+- An activity log alert should exist for specific Administrative operations
+
+## 5.2.4 Ensure that Activity Log Alert exists for Create or Update Network Security Group Rule
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that specific activity log alerts exists.
+
+- An activity log alert should exist for specific Administrative operations
+
+## 5.2.5 Ensure that activity log alert exists for the Delete Network Security Group Rule
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that specific activity log alerts exists.
+
+- An activity log alert should exist for specific Administrative operations
+
+## 5.2.6 Ensure that Activity Log Alert exists for Create or Update Security Solution
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that specific activity log alerts exists.
+
+- An activity log alert should exist for specific Security operations
+
+## 5.2.7 Ensure that Activity Log Alert exists for Delete Security Solution
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that specific activity log alerts exists.
+
+- An activity log alert should exist for specific Security operations
+
+## 5.2.8 Ensure that Activity Log Alert exists for Create or Update or Delete SQL Server Firewall Rule
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that specific activity log alerts exists.
+
+- An activity log alert should exist for specific Administrative operations
+
+## 5.2.9 Ensure that Activity Log Alert exists for Update Security Policy
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that specific activity log alerts exists.
+
+- An activity log alert should exist for specific Security operations
+
+## 6.1 Ensure that RDP access is restricted from the internet
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that RDP access is restricted.
+
+- RDP access from the Internet should be blocked
+
+## 6.2 Ensure that SSH access is restricted from the internet
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure that SSH access is restricted.
+
+- SSH access from the Internet should be blocked
+
 ## 6.5 Ensure that Network Watcher is 'Enabled'
 
 This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
@@ -429,7 +500,7 @@ ensure that only approved virtual machine extensions are installed. This policy
 a parameter array that specifies all approved virtual machine extensions. This policy initiative
 definition contains suggested defaults that customers should validate. 
 
- - Only approved VM extensions should be installed
+- Only approved VM extensions should be installed
 
 ## 7.5 Ensure that the latest OS Patches for all Virtual Machines are applied
 
@@ -457,7 +528,16 @@ ensure that key vault objects are recoverable in the case of accidental deletion
 This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
 ensure role-based access control is used to managed permissions in Kubernetes service clusters
 
-- \[Preview\]: Role-Based Access Control (RBAC) should be used on Kubernetes Services
+- Role-Based Access Control (RBAC) should be used on Kubernetes Services
+
+## 9.1 Ensure App Service Authentication is set on Azure App Service
+
+This blueprint assigns an [Azure Policy](../../../policy/overview.md) definition that helps you
+ensure requests to App Service apps are authenticated.
+
+- Authentication should be enabled on your API app
+- Authentication should be enabled on your Function app
+- Authentication should be enabled on your web app
 
 ## 9.2 Ensure web app redirects all HTTP traffic to HTTPS in Azure App Service
 
@@ -526,7 +606,7 @@ This blueprint assigns [Azure Policy](../../../policy/overview.md) definitions t
 that web apps are using the latest version of Java.
 
 - Ensure that 'Java version' is the latest, if used as a part of the Api app
-- Ensure that 'Java version' is the latest, if used as a part of the Funtion app
+- Ensure that 'Java version' is the latest, if used as a part of the Function app
 - Ensure that 'Java version' is the latest, if used as a part of the Web app
 
 ## 9.10 Ensure that 'HTTP Version' is the latest, if used to run the web app
@@ -538,7 +618,6 @@ that web apps are using the latest version of HTTP.
 - Ensure that 'HTTP Version' is the latest, if used to run the Function app
 - Ensure that 'HTTP Version' is the latest, if used to run the Web app
 
-
 ## Next steps
 
 Now that you've reviewed the control mapping of the CIS Microsoft Azure Foundations Benchmark