Merge pull request #185298 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: ttorble

articles/api-management/api-management-access-restriction-policies.md

@@ -287,7 +287,7 @@ The `quota` policy enforces a renewable or lifetime call volume and/or bandwidth
 
 ```xml
 <quota calls="number" bandwidth="kilobytes" renewal-period="seconds">
-    <api name="API name" id="API id" calls="number" renewal-period="seconds" />
+    <api name="API name" id="API id" calls="number" renewal-period="seconds">
         <operation name="operation name" id="operation id" calls="number" renewal-period="seconds" />
     </api>
 </quota>

articles/app-service/environment/overview.md

@@ -5,7 +5,7 @@ author: madsd
 ms.topic: overview
 ms.date: 11/15/2021
 ms.author: madsd
-ms.custom: references_regions, fasttrack-edit
+ms.custom: references_regions
 ---
 # App Service Environment overview
 
@@ -48,12 +48,6 @@ The ASE is a single tenant deployment of the Azure App Service that runs in your
 
 Applications are hosted in App Service plans, which are created in an App Service Environment. The App Service plan is essentially a provisioning profile for an application host. As you scale your App Service plan out, you create more application hosts with all of the apps in that App Service plan on each host. A single ASEv3 can have up to 200 total App Service plan instances across all of the App Service plans combined. A single Isolated v2 App Service plan can have up to 100 instances by itself.
 
-> [!NOTE]
-> It is possible for the App Service plans and the apps they host to be provisioned in a different Subscription to the App Service Environment. This can be useful for segregating access. The prerequisties are:
-> - The Subscriptions must share the same Azure AD Tenant
-> - The App Service Environment, App Service plans and apps must be in the same region
-> - Today you cannot create App Service Plans and apps in a different subscription using the Azure Portal. Instead, use either [Azure REST API](/rest/api/appservice/app-service-plans/create-or-update) or [Azure Resource Manager Templates](/azure/templates/microsoft.web/allversions).
-
 ## Virtual network support
 
 The ASE feature is a deployment of the Azure App Service into a single subnet in a customer's virtual network. When you deploy an app into an ASE, the app will be exposed on the inbound address assigned to the ASE. If your ASE is deployed with an internal virtual IP (VIP), then the inbound address for all of the apps will be an address in the ASE subnet. If your ASE is deployed with an external VIP, then the inbound address will be an internet addressable address and your apps will be in public DNS.

articles/automanage/automanage-virtual-machines.md

@@ -41,7 +41,7 @@ There are several prerequisites to consider before trying to enable Azure Automa
 - VMs must be in a supported region (see below)
 - User must have correct permissions (see below)
 - Automanage does not support Sandbox subscriptions at this time
-- Automanage does not support Windows 10 at this time
+- Automanage does not support Windows client images at this time
 
 ### Supported regions
 Automanage only supports VMs located in the following regions:
@@ -91,7 +91,18 @@ For the complete list of participating Azure services, as well as their supporte
 
 In the Azure portal, you can enable Automanage on an existing virtual machine. For concise steps to this process, check out the [Automanage for virtual machines quickstart](quick-create-virtual-machines-portal.md).
 
-If it is your first time enabling Automanage for your VM, you can search in the Azure portal for **Automanage – Azure machine best practices**. Click **Enable on existing VM**, select the [configuration profile](#configuration-profile) you wish to use and then select the machines you would like to onboard. Click **Enable**, and you're done.
+If it is your first time enabling Automanage for your VM, you can search in the Azure portal for **Automanage – Azure machine best practices**. Click **Enable on existing VM**, select the [configuration profile](#configuration-profile) you wish to use and then select the machines you would like to onboard. 
+
+In the Machine selection pane in the portal, you will notice the **Eligibility** column. You can click **Show ineligible machines** to see machines ineligible for Automanage. Currently, machines can be ineligible for the following reasons:
+- Machine is not using one of the supported images: [Windows Server versions](automanage-windows-server.md#supported-windows-server-versions) and [Linux distros](automanage-linux.md#supported-linux-distributions-and-versions)
+- Machine is not located in a supported [region](#supported-regions)
+- Machine's log analytics workspace is not located in a supported [region](#supported-regions)
+- User does not have permissions to the log analytics workspace's subscription. Check out the [required permissions](#required-rbac-permissions)
+- The Automanage resource provider is not registered on the subscription. Check out [how to register a Resource Provider](/azure/azure-resource-manager/management/resource-providers-and-types#register-resource-provider-1) with the Automanage resource provider: *Microsoft.Automanage*
+- Machine does not have necessary VM agents installed which the Automanage service requires. Check out the [Windows agent installation](/azure/virtual-machines/extensions/agent-windows) and the [Linux agent installation](/azure/virtual-machines/extensions/agent-linux)
+- Arc machine is not connected. Learn more about the [Arc agent status](/azure/azure-arc/servers/overview#agent-status) and [how to connect](/azure/azure-arc/servers/agent-overview#connected-machine-agent-technical-overview)
+
+Once you have selected your eligible machines, Click **Enable**, and you're done.
 
 The only time you might need to interact with this machine to manage these services is in the event we attempted to remediate your VM, but failed to do so. If we successfully remediate your VM, we will bring it back into compliance without even alerting you. For more details, see [Status of VMs](#status-of-vms).
 
@@ -143,8 +154,9 @@ The **Status** column can display the following states:
 - *Conformant* - the VM is configured and no drift is detected
 - *Not conformant* - the VM has drifted and we were unable to remediate or the machine is powered off and Automanage will attempt to onboard or remediate the VM when it is next running
 - *Needs upgrade* - the VM is onboarded to an earlier version of Automanage and needs to be [upgraded](automanage-upgrade.md) to the latest version
+- *Error* - the Automanage service is unable to monitor one or more resources
 
-If you see the **Status** as *Not conformant*, you can troubleshoot by clicking on the status in the portal and using the troubleshooting links provided
+If you see the **Status** as *Not conformant* or *Error*, you can troubleshoot by clicking on the status in the portal and using the troubleshooting links provided
 
 
 ## Disabling Automanage for VMs

articles/azure-monitor/app/codeless-overview.md

@@ -19,13 +19,13 @@ As we're adding new integrations, the auto-instrumentation capability matrix bec
 |Environment/Resource Provider          | .NET            | .NET Core       | Java            | Node.js         | Python          |
 |---------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|
 |Azure App Service on Windows           | GA, OnBD*       | GA, opt-in      | Public Preview  | Public Preview  | Not supported   |
-|Azure App Service on Linux             | N/A             | Not supported   | GA              | GA              | Not supported   |
+|Azure App Service on Linux             | N/A             | Public Preview  | GA              | GA              | Not supported   |
 |Azure Functions - basic                | GA, OnBD*       | GA, OnBD*       | GA, OnBD*       | GA, OnBD*       | GA, OnBD*       |
 |Azure Functions - dependencies         | Not supported   | Not supported   | Public Preview  | Not supported   | Through [extension](monitor-functions.md#distributed-tracing-for-python-function-apps)   |
 |Azure Spring Cloud                     | Not supported   | Not supported   | Public Preview  | Not supported   | Not supported   |
 |Azure Kubernetes Service               | N/A             | Not supported   | Through agent   | Not supported   | Not supported   |
-|Azure VMs Windows                      | Public Preview  | Not supported   | Through agent   | Not supported   | Not supported   |
-|On-Premises VMs Windows                | GA, opt-in      | Not supported   | Through agent   | Not supported   | Not supported   |
+|Azure VMs Windows                      | Public Preview  | Public Preview  | Through agent   | Not supported   | Not supported   |
+|On-Premises VMs Windows                | GA, opt-in      | Public Preview  | Through agent   | Not supported   | Not supported   |
 |Standalone agent - any env.            | Not supported   | Not supported   | GA              | Not supported   | Not supported   |
 
 *OnBD is short for On by Default - the Application Insights will be enabled automatically once you deploy your app in supported environments. 

articles/azure-monitor/app/distributed-tracing.md

@@ -33,7 +33,7 @@ The Application Insights agents and/or SDKs for .NET, .NET Core, Java, Node.js,
 * [.NET](asp-net.md)
 * [.NET Core](asp-net-core.md)
 * [Java](./java-in-process-agent.md)
-* [Node.js](../app/nodejs-quick-start.md)
+* [Node.js](../app/nodejs.md)
 * [JavaScript](./javascript.md)
 * [Python](opencensus-python.md)
 

articles/azure-portal/azure-portal-dashboards.md

@@ -113,7 +113,7 @@ By default, data will be refreshed every hour. To change this, select **Auto ref
 
 The default time settings are **UTC Time**, showing data for the **Past 24 hours**. To change this, select the button and choose a new time range, time granularity, and/or time zone, then select **Apply**.
 
-To apply additional filters, select **Add filters**. The options you'll see will vary depending on the tiles in your dashboard. For example, you may be able to show only data for a specific subscription or location. Select the filter you'd like to use and make your selections. The filter will then be applied to your data. To remove a filter, select the **X** in its button.
+To apply additional filters, select **Add filter**. The options you'll see will vary depending on the tiles in your dashboard. For example, you may be able to show only data for a specific subscription or location. Select the filter you'd like to use and make your selections. The filter will then be applied to your data. To remove a filter, select the **X** in its button.
 
 Tiles which support filtering have a ![filter icon](./media/azure-portal-dashboards/dashboard-filter.png) filter icon in the top-left corner of the tile. Some tiles allow you to override the global filters with filters specific to that tile. To do so, select **Configure tile data** from the context menu, or select the filter icon, then apply the desired filters.
 

articles/azure-relay/includes/relay-hybrid-connections-dotnet-get-started-client.md

@@ -29,9 +29,16 @@ In Visual Studio, create a new **Console App (.NET Framework)** project.
 2. Add constants to the `Program` class for the hybrid connection details. Replace the placeholders in brackets with the values that you obtained when you created the hybrid connection. Be sure to use the fully qualified namespace name.
 
     ```csharp
+    // replace {RelayNamespace} with the name of your namespace
     private const string RelayNamespace = "{RelayNamespace}.servicebus.windows.net";
+    
+    // replace {HybridConnectionName} with the name of your hybrid connection
     private const string ConnectionName = "{HybridConnectionName}";
+    
+    // replace {SAKKeyName} with the name of your Shared Access Policies key, which is RootManageSharedAccessKey by default
     private const string KeyName = "{SASKeyName}";
+    
+    // replace {SASKey} with the primary key of the namespace you saved earlier
     private const string Key = "{SASKey}";
     ```
 3. Add the following method to the `Program` class:

articles/azure-sql/database/failover-group-add-elastic-pool-tutorial.md

@@ -10,7 +10,7 @@ ms.topic: tutorial
 author: emlisa
 ms.author: emlisa
 ms.reviewer: kendralittle, mathoma
-ms.date: 01/05/2022
+ms.date: 01/17/2022
 ---
 # Tutorial: Add an Azure SQL Database elastic pool to a failover group
 

articles/azure-sql/database/failover-group-add-single-database-tutorial.md

@@ -10,7 +10,7 @@ ms.topic: tutorial
 author: emlisa
 ms.author: emlisa
 ms.reviewer: kendralittle, mathoma
-ms.date: 01/05/2022
+ms.date: 01/17/2022
 ---
 # Tutorial: Add an Azure SQL Database to an autofailover group
 

articles/azure-sql/database/scripts/add-database-to-failover-group-cli.md

@@ -10,7 +10,7 @@ ms.topic: sample
 author: emlisa
 ms.author: emlisa
 ms.reviewer: kendralittle, mathoma
-ms.date: 01/05/2022
+ms.date: 01/17/2022
 ---
 
 # Use Azure CLI to add a database to a failover group