Merge pull request #176474 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 98e50e1aee6f · 2021-10-20T09:55:35.000-07:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
diff --git a/articles/azure-monitor/agents/agent-manage.md b/articles/azure-monitor/agents/agent-manage.md
@@ -18,7 +18,7 @@ The Log Analytics agent for Windows and Linux can be upgraded to the latest rele
 
 | Environment | Installation Method | Upgrade method |
 |--------|----------|-------------|
-| Azure VM | Log Analytics agent VM extension for Windows/Linux | Agent is automatically upgraded by default unless you configured your Azure Resource Manager template to opt out by setting the property *autoUpgradeMinorVersion* to **false**. |
+| Azure VM | Log Analytics agent VM extension for Windows/Linux | Agent is automatically upgraded by default [after the VM model changes](../../virtual-machines/extensions/features-linux.md#how-do-agents-and-extensions-get-updated), unless you configured your Azure Resource Manager template to opt out by setting the property *autoUpgradeMinorVersion* to **false**. |
 | Custom Azure VM images | Manual install of Log Analytics agent for Windows/Linux | Updating VMs to the newest version of the agent needs to be performed from the command line running the Windows installer package or Linux self-extracting and installable shell script bundle.|
 | Non-Azure VMs | Manual install of Log Analytics agent for Windows/Linux | Updating VMs to the newest version of the agent needs to be performed from the command line running the Windows installer package or Linux self-extracting and installable shell script bundle. |
 
@@ -290,4 +290,4 @@ Perform the following steps to configure the Log Analytics agent for Linux to re
 
 - Review [Troubleshooting the Linux agent](agent-linux-troubleshoot.md) if you encounter issues while installing or managing the Linux agent.
 
-- Review [Troubleshooting the Windows agent](agent-windows-troubleshoot.md) if you encounter issues while installing or managing the Windows agent.
+- Review [Troubleshooting the Windows agent](agent-windows-troubleshoot.md) if you encounter issues while installing or managing the Windows agent.
diff --git a/articles/azure-monitor/containers/container-insights-log-query.md b/articles/azure-monitor/containers/container-insights-log-query.md
@@ -74,7 +74,8 @@ Perf
 InsightsMetrics
 | where Name == "requests_count"
 | summarize Val=any(Val) by TimeGenerated=bin(TimeGenerated, 1m)
-| sort by TimeGenerated asc<br> &#124; project RequestsPerMinute = Val - prev(Val), TimeGenerated
+| sort by TimeGenerated asc
+| project RequestsPerMinute = Val - prev(Val), TimeGenerated
 | render barchart 
 ```
 ### Pods by name and namespace
diff --git a/articles/azure-monitor/vm/monitor-virtual-machine-alerts.md b/articles/azure-monitor/vm/monitor-virtual-machine-alerts.md
@@ -45,7 +45,7 @@ Metric rules for virtual machines can use the following data:
 ### Target resource and impacted resource
 
 > [!NOTE]
-> Resource-centric log alert rules, currently in public preview, simplify log query alerts for virtual machines and replace the functionality currently provided by metric measurement queries. You can use the machine as a target for the rule, which better identifies it as the affected resource. You can also apply a single alert rule to all machines in a particular resource group or description. When resource-center log query alerts become generally available, the guidance in this scenario will be updated.
+> Resource-centric log alert rules, currently in public preview, simplify log query alerts for virtual machines and replace the functionality currently provided by metric measurement queries. You can use the machine as a target for the rule, which better identifies it as the affected resource. You can also apply a single alert rule to all machines in a particular resource group or subscription. When resource-center log query alerts become generally available, the guidance in this scenario will be updated.
 > 
 Each alert in Azure Monitor has an **Affected resource** property, which is defined by the target of the rule. For metric alert rules, the affected resource is the computer, which allows you to easily identify it in the standard alert view. Log query alerts are associated with the workspace resource instead of the machine, even when you use a metric measurement alert that creates an alert for each computer. You need to view the details of the alert to view the computer that was affected.
 
diff --git a/articles/cosmos-db/sql/sql-query-pagination.md b/articles/cosmos-db/sql/sql-query-pagination.md
@@ -18,7 +18,7 @@ In Azure Cosmos DB, queries may have multiple pages of results. This document ex
 
 Sometimes query results will be split over multiple pages. Each page's results is generated by a separate query execution. When query results cannot be returned in one single execution, Azure Cosmos DB will automatically split results into multiple pages.
 
-You can specify the maximum number of items returned by a query by setting the `MaxItemCount`. The `MaxItemCount` is specified per request and tells the query engine will to return that number of items or fewer. You can set `MaxItemCount` to `-1` if you don't want to place a limit on the number of results per query execution.
+You can specify the maximum number of items returned by a query by setting the `MaxItemCount`. The `MaxItemCount` is specified per request and tells the query engine to return that number of items or fewer. You can set `MaxItemCount` to `-1` if you don't want to place a limit on the number of results per query execution.
 
 In addition, there are other reasons that the query engine might need to split query results into multiple pages. These include:
 
diff --git a/articles/dms/known-issues-azure-postgresql-online.md b/articles/dms/known-issues-azure-postgresql-online.md
@@ -75,7 +75,7 @@ Known issues and limitations associated with online migrations from PostgreSQL t
      ```
 
 ## Size limitations
-- You can migrate up to 2 TB of data from PostgreSQL to Azure DB for PostgreSQL using a single DMS service.
+- You can migrate up to 1 TB of data from PostgreSQL to Azure DB for PostgreSQL using a single DMS service.
 ## Datatype limitations
 
   **Limitation**: If there's no primary key on tables, changes may not be synced to the target database.
diff --git a/articles/firewall-manager/vhubs-and-vnets.md b/articles/firewall-manager/vhubs-and-vnets.md
@@ -33,7 +33,7 @@ The following table compares these two architecture options and can help you dec
 |**Automated branch connectivity using SDWAN**      |Not supported|Supported|
 |**Hubs per region**     |Multiple Virtual Networks per region|Multiple Virtual Hubs per region|
 |**Azure Firewall – multiple public IP addresses**      |Customer provided|Auto generated|
-|**Azure Firewall Availability Zones**     |Supported|Not yet available|
+|**Azure Firewall Availability Zones**     |Supported|Supported|
 |**Advanced Internet security with third-party Security as a Service partners**     |Customer established and managed VPN connectivity to partner service of choice|Automated via security partner provider flow and partner management experience|
 |**Centralized route management to route traffic to the hub**     |Customer-managed User Defined Route|Supported using BGP|
 |**Multiple security provider support**|Supported with manually configured forced tunneling to third-party firewalls|Automated support for two security providers: Azure Firewall for private traffic filtering and third party for Internet filtering|
diff --git a/articles/machine-learning/how-to-use-automl-small-object-detect.md b/articles/machine-learning/how-to-use-automl-small-object-detect.md
@@ -31,8 +31,6 @@ When tiling, each image is divided into a grid of tiles. Adjacent tiles overlap
 
 * This article assumes some familiarity with how to configure an [automated machine learning experiment for computer vision tasks](how-to-auto-train-image-models.md). 
 
-[!INCLUDE [automl-sdk-version](../../includes/machine-learning-automl-sdk-version.md)]
-
 ## Supported models
 
 Small object detection using tiling is currently supported for the following models:
diff --git a/articles/purview/purview-connector-overview.md b/articles/purview/purview-connector-overview.md
@@ -24,10 +24,10 @@ details.
 ||[Azure Data Explorer](register-scan-azure-data-explorer.md)|Yes| Yes| Yes| Yes| Yes| Yes|
 ||[Azure Data Lake Storage Gen1](register-scan-adls-gen1.md)|Yes| Yes| Yes| Yes| Yes| Yes|
 ||[Azure Data Lake Storage Gen2](register-scan-adls-gen2.md)|Yes| Yes| Yes| Yes| Yes| Yes|
-||[Azure Dedicated SQL pool (formerly SQL DW)](register-scan-azure-synapse-analytics.md)|Yes| Yes| No| Yes| Yes| Yes|
-||[Azure SQL Database](register-scan-azure-sql-database.md)|Yes| Yes| No| Yes| Yes| Yes|
-||[Azure SQL Database Managed Instance](register-scan-azure-sql-database-managed-instance.md)|Yes| Yes| No| Yes| Yes| Yes|
-||[Azure Synapse Analytics (Workspace)](register-scan-synapse-workspace.md)|Yes| Yes| No| Yes| Yes| Yes|
+||[Azure Dedicated SQL pool (formerly SQL DW)](register-scan-azure-synapse-analytics.md)|Yes| Yes| Yes| Yes| Yes| Yes|
+||[Azure SQL Database](register-scan-azure-sql-database.md)|Yes| Yes| Yes| Yes| Yes| Yes|
+||[Azure SQL Database Managed Instance](register-scan-azure-sql-database-managed-instance.md)|Yes| Yes| Yes| Yes| Yes| Yes|
+||[Azure Synapse Analytics (Workspace)](register-scan-synapse-workspace.md)|Yes| Yes| Yes| Yes| Yes| Yes|
 |Database|[Cassandra](register-scan-cassandra-source.md)|Yes| Yes| No| No| No| Yes|
 ||[Google BigQuery](register-scan-google-bigquery-source.md)|Yes| Yes| No| No| No| Yes|
 ||[Hive Metastore DB](register-scan-oracle-source.md)|Yes| Yes| No| No| No| Yes|
diff --git a/articles/service-bus-messaging/service-bus-dotnet-get-started-with-queues.md b/articles/service-bus-messaging/service-bus-dotnet-get-started-with-queues.md
@@ -445,7 +445,7 @@ In this section, you'll add code to retrieve messages from the queue.
 1. Check the portal again. Wait for a few minutes and refresh the page if you don't see `0` for **Active** messages. 
 
     - The **Active** message count and **Current size** values are now **0**.
-    - In the **Messages** chart in the bottom **Metrics** section, you can see that there are eight incoming messages and eight outgoing messages for the queue. 
+    - In the **Messages** chart in the bottom **Metrics** section, you can see that there are three incoming messages and three outgoing messages for the queue. 
     
         :::image type="content" source="./media/service-bus-dotnet-get-started-with-queues/queue-messages-size-final.png" alt-text="Active messages and size after receive" lightbox="./media/service-bus-dotnet-get-started-with-queues/queue-messages-size-final.png":::
 
diff --git a/articles/service-bus-messaging/service-bus-performance-improvements.md b/articles/service-bus-messaging/service-bus-performance-improvements.md
@@ -21,7 +21,7 @@ Service Bus offers various pricing tiers. It is recommended to pick the appropri
 
    * **Standard tier** - Suited for developer/test environments or low throughput scenarios where the applications are **not sensitive** to throttling.
 
-   * **Premium tier** - Suited for production environments with varied throughput requirements where predictable latency and throughput is required. Additionally, Service Bus premium namespaces can be [auto scaled](automate-update-messaging-units.md) can be enabled to accommodate spikes in throughput.
+   * **Premium tier** - Suited for production environments with varied throughput requirements where predictable latency and throughput is required. Additionally, Service Bus premium namespaces can be [auto scaled](automate-update-messaging-units.md) and can be enabled to accommodate spikes in throughput.
 
 > [!NOTE]
 > If the right tier is not picked, there is a risk of overwhelming the Service Bus namespace which may lead to [throttling](service-bus-throttling.md).
diff --git a/articles/virtual-machines/extensions/features-linux.md b/articles/virtual-machines/extensions/features-linux.md
@@ -206,9 +206,9 @@ Moving the **command to execute** property to the **protected** configuration se
 
 ### How do agents and extensions get updated?
 
-The Agents and Extensions share the same update mechanism. Some updates do not require additional firewall rules.
+Agents and extensions share the same automatic update mechanism.
 
-When an update is available, it is only installed on the VM when there is a change to extensions, and other VM Model changes such as:
+When an update is available and automatic updates are enabled, the update is installed on the VM only after there is a change to an extension or after other VM model changes, such as:
 
 - Data disks
 - Extensions
@@ -217,8 +217,14 @@ When an update is available, it is only installed on the VM when there is a chan
 - VM size
 - Network profile
 
+> [!IMPORTANT]
+> The update is installed only after there is a change to the VM model.
+
 Publishers make updates available to regions at different times, so it is possible you can have VMs in different regions on different versions.
 
+> [!NOTE]
+> Some updates might require additional firewall rules. See [Network access](#network-access).
+
 #### Agent updates
 
 The Linux VM Agent contains *Provisioning Agent Code* and *Extension Handling code*  in one package, which cannot be separated. You can disable the *Provisioning Agent* when you want to provision on Azure using cloud-init. To do this, see [using cloud-init](../linux/using-cloud-init.md).
@@ -253,7 +259,9 @@ It is highly recommended that you always have auto update for the agent, [AutoUp
 
 #### Extension updates
 
-When an extension update is available, the Linux Agent downloads and upgrades the extension. Automatic extension updates are either *Minor* or *Hotfix*. You can opt in or opt out of extensions *Minor* updates when you provision the extension. The following example shows how to automatically upgrade minor versions in a Resource Manager template with *autoUpgradeMinorVersion": true,'*:
+When an extension update is available and automatic updates are enabled, after a [change to the VM model](#how-do-agents-and-extensions-get-updated) occurs, the Linux Agent downloads and upgrades the extension.
+
+Automatic extension updates are either *Minor* or *Hotfix*. You can opt in or opt out of extension *Minor* updates when you provision the extension. The following example shows how to automatically upgrade minor versions in a Resource Manager template with *"autoUpgradeMinorVersion": true,*:
 
 ```json
     "publisher": "Microsoft.Azure.Extensions",
@@ -269,6 +277,8 @@ When an extension update is available, the Linux Agent downloads and upgrades th
 
 To get the latest minor release bug fixes, it is highly recommended that you always select auto update in your extension deployments. Hotfix updates that carry security or key bug fixes cannot be opted out.
 
+If you disable extension automatic updates or you need to upgrade a major version, use [az vm extension set](/cli/azure/vm/extension#az_vm_extension_set) and specify the target version.
+
 ### How to identify extension updates
 
 #### Identifying if the extension is set with autoUpgradeMinorVersion on a VM
diff --git a/articles/virtual-machines/extensions/features-windows.md b/articles/virtual-machines/extensions/features-windows.md
@@ -116,7 +116,7 @@ Set-AzVMCustomScriptExtension -ResourceGroupName "myResourceGroup" `
     -Run "Create-File.ps1" -Location "West US"
 ```
 
-In the following example, the VM Access extension is used to reset the administrative password of a Windows VM to a temporary password. For more information on the VM Access extension, see [Reset Remote Desktop service in a Windows VM](/troubleshoot/azure/virtual-machines/reset-rdp). Once you have run this, you should reset the password at first login:
+In the following example, the VM Access extension is used to reset the administrative password of a Windows VM to a temporary password. For more information on the VM Access extension, see [Reset Remote Desktop service in a Windows VM](/troubleshoot/azure/virtual-machines/reset-rdp). After you have run this, you should reset the password at first login:
 
 ```powershell
 $cred=Get-Credential
@@ -247,9 +247,9 @@ These certificates secure the communication between the VM and its host during t
 
 ### How do agents and extensions get updated?
 
-The Agents and Extensions share the same update mechanism. Some updates do not require additional firewall rules.
+Agents and extensions share the same automatic update mechanism.
 
-When an update is available, it is only installed on the VM when there is a change to extensions, and other VM Model changes such as:
+When an update is available and automatic updates are enabled, the update is installed on the VM only after there is a change to an extension or other VM model changes, such as:
 
 - Data disks
 - Extensions
@@ -258,8 +258,14 @@ When an update is available, it is only installed on the VM when there is a chan
 - VM size
 - Network profile
 
+> [!IMPORTANT]
+> The update is installed only after there is a change to the VM model.
+
 Publishers make updates available to regions at different times, so it is possible you can have VMs in different regions on different versions.
 
+> [!NOTE]
+> Some updates might require additional firewall rules. See [Network access](#network-access).
+
 #### Listing Extensions Deployed to a VM
 
 ```powershell
@@ -283,7 +289,10 @@ To check what version you are running, see [Detecting installed Windows Guest Ag
 
 #### Extension updates
 
-When an extension update is available, the Windows Guest Agent downloads and upgrades the extension. Automatic extension updates are either *Minor* or *Hotfix*. You can opt in or opt out of extensions *Minor* updates when you provision the extension. The following example shows how to automatically upgrade minor versions in a Resource Manager template with *autoUpgradeMinorVersion": true,'*:
+
+When an extension update is available and automatic updates are enabled, after a [change to the VM model](#how-do-agents-and-extensions-get-updated) occurs, the Windows Guest Agent downloads and upgrades the extension.
+
+Automatic extension updates are either *Minor* or *Hotfix*. You can opt in or opt out of extension *Minor* updates when you provision the extension. The following example shows how to automatically upgrade minor versions in a Resource Manager template with *"autoUpgradeMinorVersion": true,*:
 
 ```json
     "properties": {
@@ -300,6 +309,8 @@ When an extension update is available, the Windows Guest Agent downloads and upg
 
 To get the latest minor release bug fixes, it is highly recommended that you always select auto update in your extension deployments. Hotfix updates that carry security or key bug fixes cannot be opted out.
 
+If you disable extension automatic updates or you need to upgrade a major version, use [Set-AzVMExtension](/powershell/module/az.compute/set-azvmextension) and specify the target version.
+
 ### How to identify extension updates
 
 #### Identifying if the extension is set with autoUpgradeMinorVersion on a VM
diff --git a/includes/aml-compute-target-train.md b/includes/aml-compute-target-train.md
@@ -19,7 +19,7 @@ You can use any of the following resources for a training compute target for mos
 |----|:----:|:----:|:----:|
 |[Local computer](../articles/machine-learning/how-to-attach-compute-targets.md#local)| Yes | &nbsp; | &nbsp; |
 |[Azure Machine Learning compute cluster](../articles/machine-learning/how-to-create-attach-compute-cluster.md)| Yes | Yes | Yes |
-|[Azure Machine Learning compute instance](../articles/machine-learning/how-to-create-manage-compute-instance.md) | Yes (through SDK)  | Yes |  |
+|[Azure Machine Learning compute instance](../articles/machine-learning/how-to-create-manage-compute-instance.md) | Yes (through SDK)  | Yes | Yes |
 |[Remote VM](../articles/machine-learning/how-to-attach-compute-targets.md#vm) | Yes  | Yes | &nbsp; |
 |[Apache Spark pools (preview)](../articles/machine-learning/how-to-attach-compute-targets.md#synapse)| Yes (SDK local mode only) | Yes | &nbsp; |
 |[Azure&nbsp;Databricks](../articles/machine-learning/how-to-attach-compute-targets.md#databricks)| Yes (SDK local mode only) | Yes | &nbsp; |

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ Metric rules for virtual machines can use the following data:`
`45`	`45`	`### Target resource and impacted resource`
`46`	`46`
`47`	`47`	`> [!NOTE]`
`48`		-> Resource-centric log alert rules, currently in public preview, simplify log query alerts for virtual machines and replace the functionality currently provided by metric measurement queries. You can use the machine as a target for the rule, which better identifies it as the affected resource. You can also apply a single alert rule to all machines in a particular resource group or description. When resource-center log query alerts become generally available, the guidance in this scenario will be updated.
	`48`	+> Resource-centric log alert rules, currently in public preview, simplify log query alerts for virtual machines and replace the functionality currently provided by metric measurement queries. You can use the machine as a target for the rule, which better identifies it as the affected resource. You can also apply a single alert rule to all machines in a particular resource group or subscription. When resource-center log query alerts become generally available, the guidance in this scenario will be updated.
`49`	`49`	`>`
`50`	`50`	`Each alert in Azure Monitor has an Affected resource property, which is defined by the target of the rule. For metric alert rules, the affected resource is the computer, which allows you to easily identify it in the standard alert view. Log query alerts are associated with the workspace resource instead of the machine, even when you use a metric measurement alert that creates an alert for each computer. You need to view the details of the alert to view the computer that was affected.`
`51`	`51`