Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into monitoring

normesta · normesta · commit 7945e2e0c699 · 2022-10-03T09:49:55.000-07:00
diff --git a/articles/active-directory/enterprise-users/groups-dynamic-membership.md b/articles/active-directory/enterprise-users/groups-dynamic-membership.md
@@ -396,7 +396,7 @@ The following device attributes can be used.
  deviceOSVersion | any string value | device.deviceOSVersion -eq "9.1"<br>device.deviceOSVersion -startsWith "10.0.1"
  deviceOwnership | Personal, Company, Unknown | device.deviceOwnership -eq "Company"
  devicePhysicalIds | any string value used by Autopilot, such as all Autopilot devices, OrderID, or PurchaseOrderID  | device.devicePhysicalIDs -any _ -contains "[ZTDId]"<br>(device.devicePhysicalIds -any _ -eq "[OrderID]:179887111881"<br>(device.devicePhysicalIds -any _ -eq "[PurchaseOrderId]:76222342342"
- deviceTrustType | AzureAD, ServerAD, Workplace | device.deviceOwnership -eq "AzureAD"
+ deviceTrustType | AzureAD, ServerAD, Workplace | device.deviceTrustType -eq "AzureAD"
  enrollmentProfileName | Apple Device Enrollment Profile name, Android Enterprise Corporate-owned dedicated device Enrollment Profile name, or Windows Autopilot profile name | device.enrollmentProfileName -eq "DEP iPhones"
  extensionAttribute1 | any string value | device.extensionAttribute1 -eq "some string value"
  extensionAttribute2 | any string value | device.extensionAttribute2 -eq "some string value"
diff --git a/articles/active-directory/hybrid/how-to-connect-group-writeback-v2.md b/articles/active-directory/hybrid/how-to-connect-group-writeback-v2.md
@@ -31,7 +31,7 @@ There are two versions of group writeback. The original version is in general av
 - You can configure the common name in an Active Directory group's distinguished name to include the group's display name when it's written back.  
 - You can use the Azure AD admin portal, Graph Explorer, and PowerShell to configure which Azure AD groups are written back. 
 
-The new version is available only in [Azure AD Connect version 2.0.89.0 or later](https://www.microsoft.com/download/details.aspx?id=47594). It must be enabled in addition to the original version. 
+The new version is enabled on the tenant and not per Azure AD Connect client instance. Make sure that all Azure AD Connect client instances are updated to a minimal build of [Azure AD Connect version 2.0 or later](https://www.microsoft.com/download/details.aspx?id=47594) if group writeback is currently enabled on the client instance. 
 
 This article walks you through activities that you should complete before you enable group writeback for your tenant. These activities include discovering your current configuration, verifying the prerequisites, and choosing the deployment approach. 
 
diff --git a/articles/azure-functions/functions-how-to-use-azure-function-app-settings.md b/articles/azure-functions/functions-how-to-use-azure-function-app-settings.md
@@ -265,7 +265,7 @@ The Functions editor built into the Azure portal lets you update your function c
 Files in the root of the app, such as function.proj or extensions.csproj need to be created and edited by using the [Advanced Tools (Kudu)](#kudu).
 
 1. Select your function app, then under **Development tools** select **Advanced tools** > **Go**.
-1. If promoted, sign-in to the SCM site with your Azure credentials.
+1. If prompted, sign-in to the SCM site with your Azure credentials.
 1. From the **Debug console** menu, choose **CMD**.
 1. Navigate to `.\site\wwwroot`, select the plus (**+**) button at the top, and select **New file**.
 1. Name the file, such as `extensions.csproj` and press Enter.
diff --git a/articles/azure-monitor/agents/azure-monitor-agent-migration.md b/articles/azure-monitor/agents/azure-monitor-agent-migration.md
@@ -2,7 +2,7 @@
 title: Migrate from legacy agents to Azure Monitor Agent
 description: This article provides guidance for migrating from the existing legacy agents to the new Azure Monitor Agent (AMA) and data collection rules (DCR).
 ms.topic: conceptual
-author: guywild
+author: guywi-ms
 ms.author: guywild
 ms.reviewer: shseth
 ms.date: 9/14/2022 
@@ -11,7 +11,7 @@ ms.custom: devx-track-azurepowershell, devx-track-azurecli
 ---
 
 # Migrate to Azure Monitor Agent from Log Analytics agent
-[Azure Monitor Agent (AMA)](./agents-overview.md) replaces the Log Analytics agent (also known as MMA and OMS) for both Windows and Linux machines, in Azure and on premises. It introduces a simplified, flexible method of configuring collection configuration called [Data Collection Rules (DCRs)](../essentials/data-collection-rule-overview.md). This article outlines the benefits of migrating to Azure Monitor Agent (AMA) and provides guidance on how to implement a successful migration.
+[Azure Monitor Agent (AMA)](./agents-overview.md) replaces the Log Analytics agent (also known as MMA and OMS) for both Windows and Linux machines, in both Azure and non-Azure (on-premises and 3rd party clouds) environments. It introduces a simplified, flexible method of configuring collection configuration called [Data Collection Rules (DCRs)](../essentials/data-collection-rule-overview.md). This article outlines the benefits of migrating to Azure Monitor Agent (AMA) and provides guidance on how to implement a successful migration.
 
 > [!IMPORTANT]
 > The Log Analytics agent will be [retired on **31 August, 2024**](https://azure.microsoft.com/updates/were-retiring-the-log-analytics-agent-in-azure-monitor-on-31-august-2024/). If you are currently using the Log Analytics agent with Azure Monitor or other supported features and services, you should start planning your migration to Azure Monitor Agent using the information in this article.
@@ -49,7 +49,7 @@ Your migration plan to the Azure Monitor Agent should take into account:
     - Running two telemetry agents on the same machine consumes double the resources, including, but not limited to CPU, memory, storage space, and network bandwidth.
 
 ## Prerequisites
-Review the [prerequisites](./azure-monitor-agent-manage.md#prerequisites) for use Azure Monitor Agent. For on-premises servers or other cloud managed servers, [installing the Azure Arc agent](/azure/azure-arc/servers/agent-overview) is an important prerequisite that then helps to install the agent extension and other required extensions. Using Arc for this purpose comes at no added cost, and it's not mandatory to use Arc for server management overall (i.e. you can continue using your existing on premises management solutions). Once Arc agent is installed, you can follow the same guidance below across Azure and on-premise for migration.
+Review the [prerequisites](./azure-monitor-agent-manage.md#prerequisites) for use Azure Monitor Agent. For non-Azure servers, [installing the Azure Arc agent](/azure/azure-arc/servers/agent-overview) is an important prerequisite that then helps to install the agent extension and other required extensions. Using Arc for this purpose comes at no added cost, and it's not mandatory to use Arc for server management overall (i.e. you can continue using your existing non-Azure management solutions). Once Arc agent is installed, you can follow the same guidance below across Azure and non-Azure for migration.
 
 ## Migration testing
 To ensure safe deployment during migration, begin testing with few resources running Azure Monitor Agent in your nonproduction environment. After you validate the data collected on these test resources, roll out to production by following the same steps.
@@ -58,7 +58,7 @@ See [create new data collection rules](./data-collection-rule-azure-monitor-agen
 After you **validate** that data is flowing as expected with Azure Monitor Agent, check the `Category` column in the [Heartbeat](/azure/azure-monitor/reference/tables/heartbeat) table for the value *Azure Monitor Agent* for AMA collected data. Ensure it matches data flowing through the existing Log Analytics agent.
 
 ## At-scale migration using Azure Policy
-We recommend using [Azure Policy](../../governance/policy/overview.md) to migrate a large number of agents. Start by analyzing your current monitoring setup with the Log Analytics agent using the [AMA Migration Helper](./azure-monitor-agent-migration-tools.md#using-ama-migration-helper-preview) to find sources, such as virtual machines, virtual machine scale sets, and on-premises servers.
+We recommend using [Azure Policy](../../governance/policy/overview.md) to migrate a large number of agents. Start by analyzing your current monitoring setup with the Log Analytics agent using the [AMA Migration Helper](./azure-monitor-agent-migration-tools.md#using-ama-migration-helper-preview) to find sources, such as virtual machines, virtual machine scale sets, and non-Azure servers.
  
 Use the [DCR Config Generator](./azure-monitor-agent-migration-tools.md#installing-and-using-dcr-config-generator-preview) to migrate legacy agent configuration, including data sources and destinations, from the workspace to the new DCRs.
 
diff --git a/articles/firewall/long-running-sessions.md b/articles/firewall/long-running-sessions.md
@@ -5,7 +5,7 @@ services: firewall
 author: vhorne
 ms.service: firewall
 ms.topic: article
-ms.date: 09/22/2022
+ms.date: 10/03/2022
 ms.author: victorh 
 ---
 
@@ -16,14 +16,14 @@ Azure Firewall is designed to be available and redundant. Every effort is made t
 ## Scenarios that impact long running TCP sessions
 
 The following scenarios can potentially drop long running TCP sessions:
-- Scale down
+- Scale in
 - Firewall maintenance
 - Idle timeout
 - Auto-recovery
 
-### Scale down
+### Scale in
 
-Azure Firewall scales up\down based on throughput and CPU usage. Scale down is performed by putting the VM instance in drain mode for 90 seconds before recycling the VM instance. Any long running connections remaining on the VM instance after 90 seconds will be disconnected.
+Azure Firewall scales in/out based on throughput and CPU usage. Scale in is performed by putting the VM instance in drain mode for 90 seconds before recycling the VM instance. Any long running connections remaining on the VM instance after 90 seconds will be disconnected.
 
 ### Firewall maintenance
 
diff --git a/articles/iot-edge/how-to-vs-code-develop-module.md b/articles/iot-edge/how-to-vs-code-develop-module.md
@@ -125,49 +125,49 @@ The [IoT Edge Dev Tool](https://github.com/Azure/iotedgedev) simplifies Azure Io
     mkdir c:\dev\iotedgesolution
     ```
 
-1. Use the **iotedgedev init** command to create a solution and set up your Azure IoT Hub. Use the following command to create an IoT Edge solution for a specified development language.
+1. Use the **iotedgedev solution init** command to create a solution and set up your Azure IoT Hub. Use the following command to create an IoT Edge solution for a specified development language.
 
     # [C](#tab/c)
     
     ```bash
-    iotedgedev init --template c
+    iotedgedev solution init --template c
     ```
     
     # [C\#](#tab/csharp)
     
     ```bash
-    iotedgedev init --template csharp
+    iotedgedev solution init --template csharp
     ```
     
     The solution includes a default C# module named *filtermodule*.
     
     # [Azure Functions](#tab/azfunctions)
     
     ```bash
-    iotedgedev init --template csharpfunction
+    iotedgedev solution init --template csharpfunction
     ```
     
     # [Java](#tab/java)
     
     ```bash
-    iotedgedev init --template java
+    iotedgedev solution init --template java
     ```
 
     # [Node.js](#tab/node)
 
     ```bash
-    iotedgedev init --template nodejs
+    iotedgedev solution init --template nodejs
     ```
 
     # [Python](#tab/python)
 
     ```bash
-    iotedgedev init --template python
+    iotedgedev solution init --template python
     ```
 
     ---
 
-The *iotedgedev init* script prompts you to complete several steps including:
+The *iotedgedev solution init* script prompts you to complete several steps including:
 
 * Authenticate to Azure
 * Choose an Azure subscription
diff --git a/articles/storage/common/storage-ref-azcopy-sync.md b/articles/storage/common/storage-ref-azcopy-sync.md
@@ -25,7 +25,7 @@ The last modified times are used for comparison. The file is skipped if the last
 
 The sync command differs from the copy command in several ways:
 
-  1. By default, the recursive flag is true and sync copies all subdirectories. Sync only copies the top-level files inside a directory if the recursive flag is false.
+  1. By default, the recursive flag is true and sync copies all subdirectories. Sync copies only the top-level files inside a directory if the recursive flag is false.
   2. When syncing between virtual directories, add a trailing slash to the path (refer to examples) if there's a blob with the same name as one of the virtual directories.
   3. If the 'delete-destination' flag is set to true or prompt, then sync will delete files and blobs at the destination that aren't present at the source.
 
diff --git a/articles/virtual-desktop/TOC.yml b/articles/virtual-desktop/TOC.yml
@@ -95,7 +95,7 @@
     href: management.md
   - name: Host pool load-balancing methods
     href: host-pool-load-balancing.md
-  - name: FSLogix profile containers and Azure files
+  - name: FSLogix profile containers and Azure Files
     href: fslogix-containers-azure-files.md
   - name: Storage options for FSLogix profile containers
     href: store-fslogix-profile.md
diff --git a/articles/virtual-desktop/fslogix-containers-azure-files.md b/articles/virtual-desktop/fslogix-containers-azure-files.md
@@ -1,6 +1,6 @@
 ---
 title: Azure Virtual Desktop FSLogix profile containers files - Azure
-description: This article describes FSLogix profile containers within Azure Virtual Desktop and Azure files.
+description: This article describes FSLogix profile containers within Azure Virtual Desktop and Azure Files.
 author: Heidilohr
 ms.topic: conceptual
 ms.date: 01/04/2021
