Merge branch 'main' into ams-naming

lauradolan · web-flow · commit 5e071793ca50 · 2022-07-21T10:45:25.000-04:00
diff --git a/articles/aks/upgrade-cluster.md b/articles/aks/upgrade-cluster.md
@@ -51,7 +51,7 @@ Name     ResourceGroup    MasterVersion    Upgrades
 default  myResourceGroup  1.18.10          1.19.1, 1.19.3
 ```
 
-The following output shows that no upgrades are available:
+The following output shows that no upgrades are available (or it may also be possible that cli is not upgraded):
 
 ```console
 ERROR: Table output unavailable. Use the --query option to specify an appropriate query. Use --debug for more info.
diff --git a/articles/center-sap-solutions/includes/preview.md b/articles/center-sap-solutions/includes/preview.md
@@ -1,3 +1,3 @@
 > [!IMPORTANT]
 > Azure Center for SAP solutions (ACSS) is currently in PREVIEW.
-> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
+> See the [Azure Center for SAP solutions - Legal Terms](/legal/azure-center-for-sap-solutions/azure-center-for-sap-solutions-legal-terms) for legal notices applicable to ACSS.
diff --git a/articles/center-sap-solutions/toc.yml b/articles/center-sap-solutions/toc.yml
@@ -39,6 +39,10 @@ items:
     - name: Monitor SAP system in Azure portal
       href: monitor-portal.md
 
+- name: Reference
+  items:
+  - name: REST API
+    href: /rest/api/workloads/
 
 - name: Resources
   items:
diff --git a/articles/defender-for-cloud/enhanced-security-features-overview.md b/articles/defender-for-cloud/enhanced-security-features-overview.md
@@ -2,7 +2,7 @@
 title: Understand the basic and extended security features of Microsoft Defender for Cloud 
 description: Learn about the benefits of enabling enhanced security in Microsoft Defender for Cloud
 ms.topic: overview
-ms.date: 07/11/2022
+ms.date: 07/21/2022
 ms.custom: references_regions
 ---
 
@@ -26,13 +26,12 @@ Defender for Cloud offers a number of enhanced security features that can help p
     - **Container security features** - Benefit from vulnerability management and real-time threat protection on your containerized environments. Charges are based on the number of unique container images pushed to your connected registry. After an image has been scanned once, you won't be charged for it again unless it's modified and pushed once more.
     - **Breadth threat protection for resources connected to Azure** - Cloud-native threat protection for the Azure services common to all of your resources: Azure Resource Manager, Azure DNS, Azure network layer, and Azure Key Vault. Defender for Cloud has unique visibility into the Azure management layer and the Azure DNS layer, and can therefore protect cloud resources that are connected to those layers.
 
-
 ## FAQ - Pricing and billing 
 
 - [How can I track who in my organization enabled a Microsoft Defender plan in Defender for Cloud?](#how-can-i-track-who-in-my-organization-enabled-a-microsoft-defender-plan-in-defender-for-cloud)
 - [What are the plans offered by Defender for Cloud?](#what-are-the-plans-offered-by-defender-for-cloud)
 - [How do I enable Defender for Cloud's enhanced security for my subscription?](#how-do-i-enable-defender-for-clouds-enhanced-security-for-my-subscription)
-- [Can I enable Microsoft Defender for Servers on a subset of servers in my subscription?](#can-i-enable-microsoft-defender-for-servers-on-a-subset-of-servers-in-my-subscription)
+- [Can I enable Microsoft Defender for Servers on a subset of servers?](#can-i-enable-microsoft-defender-for-servers-on-a-subset-of-servers)
 - [If I already have a license for Microsoft Defender for Endpoint, can I get a discount for Defender for Servers?](#if-i-already-have-a-license-for-microsoft-defender-for-endpoint-can-i-get-a-discount-for-defender-for-servers)
 - [My subscription has Microsoft Defender for Servers enabled, do I pay for not-running servers?](#my-subscription-has-microsoft-defender-for-servers-enabled-do-i-pay-for-not-running-servers)
 - [Will I be charged for machines without the Log Analytics agent installed?](#will-i-be-charged-for-machines-without-the-log-analytics-agent-installed)
@@ -67,23 +66,23 @@ You can use any of the following ways to enable enhanced security for your subsc
 | Azure Policy                                    | [Bundle Pricings](https://github.com/Azure/Azure-Security-Center/blob/master/Pricing%20%26%20Settings/ARM%20Templates/Set-ASC-Bundle-Pricing.json) |
 
 
-### Can I enable Microsoft Defender for Servers on a subset of servers in my subscription?
+### Can I enable Microsoft Defender for Servers on a subset of servers?
 
-No. When you enable [Microsoft Defender for Servers](defender-for-servers-introduction.md) on a subscription, all the machines in the subscription will be protected by Defender for Servers.
+No. When you enable [Microsoft Defender for Servers](defender-for-servers-introduction.md) on an Azure subscription or a connected AWS account, all of the connected machines will be protected by Defender for Servers.
 
-An alternative is to enable Microsoft Defender for Servers at the Log Analytics workspace level. If you do this, only servers reporting to that workspace will be protected and billed. However, several capabilities will be unavailable. These include Microsoft Defender for Endpoint, VA solution (TVM/Qualys), just-in-time VM access, and more. 
+Another alternative, is to enable Microsoft Defender for Servers at the Log Analytics workspace level. If you do this, only servers reporting to that workspace will be protected and billed. However, several capabilities will be unavailable. These include Microsoft Defender for Endpoint, VA solution (TVM/Qualys), just-in-time VM access, and more. 
 
 ### If I already have a license for Microsoft Defender for Endpoint, can I get a discount for Defender for Servers?
 
-If you've already got a license for **Microsoft Defender for Endpoint for Servers Plan 2**, you won't have to pay for that part of your Microsoft Defender for Servers license. Learn more about [this license](/microsoft-365/security/defender-endpoint/minimum-requirements#licensing-requirements).
+If you already have a license for **Microsoft Defender for Endpoint for Servers Plan 2**, you won't have to pay for that part of your Microsoft Defender for Servers license. Learn more about [this license](/microsoft-365/security/defender-endpoint/minimum-requirements#licensing-requirements).
 
 To request your discount, [contact Defender for Cloud's support team](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview). You'll need to provide the relevant workspace ID, region, and number of Microsoft Defender for Endpoint for servers licenses applied for machines in the given workspace.
 
 The discount will be effective starting from the approval date, and won't take place retroactively.
 
 ### My subscription has Microsoft Defender for Servers enabled, do I pay for not-running servers?
 
-No. When you enable [Microsoft Defender for Servers](defender-for-servers-introduction.md) on a subscription, you won't be charged for any machines that are in the deallocated power state while they're in that state. Machines are billed according to their power state as shown in the following table:
+No. When you enable [Microsoft Defender for Servers](defender-for-servers-introduction.md) on a subscription, you won't be charged for any machines that are in a deallocated power state while they're in that state. Machines are billed according to their power state as shown in the following table:
 
 | State        | Description                                                                                                                                      | Instance usage billed |
 |--------------|--------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------|
@@ -112,11 +111,11 @@ If you enable the Servers plan on cross-subscription workspaces, connected VMs f
 
 ### Will I be charged for machines without the Log Analytics agent installed?
 
-Yes. When you enable [Microsoft Defender for Servers](defender-for-servers-introduction.md) on a subscription, you're charged for all machines in the subscription, including Azure virtual machines, Azure virtual machine scale sets instances, and Azure Arc-enabled servers. Machines that don't have Log Analytics installed are covered by protections that don't depend on the Log Analytics agent.
+Yes. When you enable [Microsoft Defender for Servers](defender-for-servers-introduction.md) on an Azure subscription or a connected AWS account, you'll be charged for all machines that are connected to your Azure subscription or AWS account. The term machines includes Azure virtual machines, Azure virtual machine scale sets instances, and Azure Arc-enabled servers. Machines that don't have Log Analytics installed are covered by protections that don't depend on the Log Analytics agent.
 
 ### If a Log Analytics agent reports to multiple workspaces, will I be charged twice?
 
-If a machine reports to multiple workspaces, and all of them have Defender for Servers enabled, the machines will be billed for each attached workspace.
+If a machine, reports to multiple workspaces, and all of them have Defender for Servers enabled, the machines will be billed for each attached workspace.
 
 ### If a Log Analytics agent reports to multiple workspaces, is the 500-MB free data ingestion available on all of them?
 
diff --git a/articles/virtual-machines/workloads/sap/azure-monitor-sap-quickstart.md b/articles/virtual-machines/workloads/sap/azure-monitor-sap-quickstart.md
@@ -34,9 +34,9 @@ Sign in to the [Azure portal](https://portal.azure.com).
     ![Diagram that shows Azure Monitor for SAP solutions Quick Start 2.](./media/azure-monitor-sap/azure-monitor-quickstart-2-new.png)
 
 
-###### For Azure Monitor for SAP solutions (Classic)
+###### For Azure Monitor for SAP solutions (classic)
 
-1. In Azure **Marketplace** or **Search**, select **Azure Monitor for SAP solutions (Classic)**.
+1. In Azure **Marketplace** or **Search**, select **Azure Monitor for SAP solutions (classic)**.
 
   ![Diagram shows Azure Monitor for SAP solutions classic quick start page.](./media/azure-monitor-sap/azure-monitor-quickstart-classic.png)
 
@@ -48,7 +48,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
    When you're selecting a virtual network, ensure that the systems you want to monitor are reachable from within that virtual network. 
 
    > [!IMPORTANT]
-   > Selecting **Share** for **Share data with Microsoft support** enables our support teams to help you with troubleshooting. This feature is available only for Azure Monitor for SAP solutions (Classic)
+   > Selecting **Share** for **Share data with Microsoft support** enables our support teams to help you with troubleshooting. This feature is available only for Azure Monitor for SAP solutions (classic)
 
 
 
diff --git a/articles/virtual-machines/workloads/sap/monitor-sap-on-azure.md b/articles/virtual-machines/workloads/sap/monitor-sap-on-azure.md
@@ -21,8 +21,8 @@ When you have critical applications and business processes relying on Azure reso
 
 This article describes how to monitor SAP running on Azure using Azure Monitor for SAP solutions. Azure Monitor for SAP solutions uses specific parts of the [Azure Monitor](../../../azure-monitor/overview.md) infrastructure.
 
-> [!Note]
-> There are currently two versions of Azure Monitor for SAP solutions. Old one is Azure Monitor for SAP solutions (Classic) and new one is Azure Monitor for SAP solutions. This article will talk about both the versions. 
+> [!NOTE]
+> There are currently two versions of Azure Monitor for SAP solutions. Old one is Azure Monitor for SAP solutions (classic) and new one is Azure Monitor for SAP solutions. This article will talk about both the versions. 
 
 ## Overview
 
@@ -32,15 +32,13 @@ With Azure Monitor for SAP solutions, you can collect telemetry data from Azure
 
 You can monitor different components of an SAP landscape, such as Azure virtual machines (VMs), high-availability cluster, SAP HANA database, SAP NetWeaver, and so on, by adding the corresponding **provider** for that component. For more information, see [Deploy Azure Monitor for SAP solutions by using the Azure portal](azure-monitor-sap-quickstart.md).
 
-The following table provides a quick comparison of the Azure Monitor for SAP solutions (Classic) and Azure Monitor for SAP solutions. 
-
-|| Azure Monitor for SAP solutions             | Azure Monitor for SAP solutions (Classic) |
-|--------------------|---------------------------------------------|-------------------------------------------|
-| Architecture Style | Azure Function based Collector architecture | VM based collector architecture           |
-| Supported Database | Microsoft SQL Server<br>SAP HANA<br>IBM Db2 | Microsoft SQL Server<br>SAP HANA   
-|     
-
+The following table provides a quick comparison of the Azure Monitor for SAP solutions (classic) and Azure Monitor for SAP solutions. 
 
+classic
+| Azure Monitor for SAP solutions | Azure Monitor for SAP solutions (classic) |
+| ------------------------------- | ----------------------------------------- |
+| Azure Functions-based collector architecture | VM-based collector architecture |
+| Support for Microsoft SQL Server, SAP HANA, and IBM Db2 databases | Support for Microsoft SQL Server, and SAP HANA databases |
 
 Azure Monitor for SAP solutions uses the [Azure Monitor](../../../azure-monitor/overview.md) capabilities of [Log Analytics](../../../azure-monitor/logs/log-analytics-overview.md) and [Workbooks](../../../azure-monitor/visualize/workbooks-overview.md). With it, you can:
 
@@ -117,8 +115,8 @@ IBM Db2 telemetry:
 
 ## Data sharing with Microsoft
 
-> [!Note]
-> This feature is only applicable for Azure Monitor for SAP solutions (Classic) version.
+> [!NOTE]
+> This feature is only applicable for Azure Monitor for SAP solutions (classic) version.
 
 Azure Monitor for SAP solutions collects system metadata to provide improved support for SAP on Azure. No PII/EUII is collected.
 
