Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into 20211104-reference-docs

Author: MikeRayMSFT

.openpublishing.redirection.synapse-analytics.json

@@ -66,8 +66,8 @@
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/azure/synapse-analytics/security/synapse-workspace-managed-identity.md",
-            "redirect_url": "/azure/data-factory/data-factory-service-identity?context=/azure/synapse-analytics/context/context",
+            "source_path_from_root": "/articles/synapse-analytics/security/synapse-workspace-managed-identity.md",
+            "redirect_url": "/azure/data-factory/data-factory-service-identity",
             "redirect_document_id": false
         }
     ]

articles/azure-maps/azure-maps-qps-rate-limits.md

@@ -14,28 +14,28 @@ manager: eriklind
 
 Azure Maps does not have any maximum daily limits on the number of requests that can be made, however there are limits to the maximum number of queries per second (QPS).
 
-Below are the QPS usage limits for each Azure Maps service.
+Below are the QPS usage limits for each Azure Maps service by Pricing Tier.
 
-| Azure Maps service                                                                                         | QPS limit   |
-| ---------------------------------------------------------------------------------------------------------- | ----------- |
-| Creator:  Alias, GetTilesetDetails                                                                         | 10 |
-| Creator:  Conversion, Dataset, Feature State, WFS                                                          | 50 |
-| Data Service and Data Service v2                                                                           | 50 |
-| Elevation Service                                                                                          | 50 |
-| Geolocation Service                                                                                        | 50 |
-| Render Service:  Copyright                                                                                 | 10 |
-| Render Service:  Contour tiles, DEM tiles, Elevation tiles, Customer tiles, Traffic tiles and Static maps  | 50 |
-| Render Service:  Road tiles                                                                                | 500 |
-| Render Service:  Imagery tiles                                                                             | 250 |
-| Render Service:  Weather tiles                                                                             | 100 |
-| Route Service:  Batch                                                                                      | 10 |
-| Route Service:  Non-Batch                                                                                  | 50 |
-| Search Service:  Batch                                                                                     | 10 |
-| Search Service:  Non-Batch                                                                                 | 500 |
-| Search Service:  Non-Batch Reverse                                                                         | 250 |
-| Spatial Service                                                                                            | 50 |
-| Time Zone Service                                                                                          | 50 |
-| Traffic Service                                                                                            | 50 |
-| Weather Service                                                                                            | 50 |
+| Azure Maps Service | QPS Limit: Gen 2 Pricing Tier | QPS Limit: Gen 1 S1 Pricing Tier | QPS Limit: Gen 1 S0 Pricing Tier |
+|  ----------------- |  :--------------------------: | :------------------------------: | :------------------------: |
+| Copyright Service | 10 | 10 | 10 |
+| Creator - Alias, TilesetDetails | 10 | Not Available | Not Available |
+| Creator - Conversion, Dataset, Feature State, WFS | 50 | Not Available | Not Available |
+| Data Service | 50 | 50 | 50 |
+| Elevation Service | 50 | 50 | 50 |
+| Geolocation Service | 50 | 50 | 50 |
+| Render Service - Contour tiles, DEM tiles, Elevation tiles, Customer tiles, Traffic tiles and Static maps | 50 | 50 | 50 |
+| Render Service - Road tiles | 500 | 500 | 50 |
+| Render Service - Satellite tiles | 250 | 250 | 50 |
+| Render Service - Weather tiles | 100 | 100 | 50 |
+| Route Service - Batch | 10 | 10 | 10 |
+| Route Service - Non-Batch | 50 | 50 | 50 |
+| Search Service - Batch | 10 | 10 | 10 |
+| Search Service - Non-Batch | 500 | 500 | 50 |
+| Search Service - Non-Batch Reverse | 250 | 250 | 50 |
+| Spatial Service | 50 | 50 | 50 |
+| Timezone Service | 50 | 50 | 50 |
+| Traffic Service | 50 | 50 | 50 |
+| Weather Service | 50 | 50 | 50 |
 
-When QPS limits are reached, an HTTP 429 error will be returned. Create an Azure Maps *Technical* Support Request in the [Azure portal](https://ms.portal.azure.com/) if you need to increase a specific QPS limit.
+When QPS limits are reached, an HTTP 429 error will be returned. If you are using the Gen 2 or Gen 1 S1 pricing tiers, you can create an Azure Maps *Technical* Support Request in the [Azure portal](https://ms.portal.azure.com/) to increase a specific QPS limit if needed. QPS limits for the Gen 1 S0 pricing tier cannot be increased.

articles/azure-maps/choose-pricing-tier.md

@@ -1,30 +1,31 @@
 ---
 title: Choose the right pricing tier for Microsoft Azure Maps
 description: Learn about Azure Maps pricing tiers. See which features are offered at which tiers, and view key considerations for choosing a pricing tier. 
-author: anastasia-ms
-ms.author: v-stharr
-ms.date: 04/27/2020
+author: stevemunk
+ms.author: v-munksteve
+ms.date: 11/04/2021
 ms.topic: conceptual
 ms.service: azure-maps
 services: azure-maps
-
 ---
 
 # Choose the right pricing tier in Azure Maps
 
-Azure Maps now offers two pricing tiers:  Gen 1 and Gen 2. The Gen 2 new pricing tier contains all Azure Maps capabilities without any QPS (Queries Per Second) restriction and allows you to achieve cost savings as Azure Maps transactions increases. The purpose of this article is to help you choose the right pricing tier for your needs.
+Azure Maps now offers two pricing tiers: Gen 1 and Gen 2. The new Gen 2 pricing tier contains all Azure Maps capabilities with increased QPS (Queries Per Second) limits over Gen 1, and it allows you to achieve cost savings as Azure Maps transactions increases. The purpose of this article is to help you choose the right pricing tier for your needs.
 
 ## Pricing tier targeted customers
 
-See the **pricing tier targeted customers** table below for a better understanding of Gen 1 and Gen 2 pricing tiers.  For more information, see [Azure Maps pricing](https://azure.microsoft.com/pricing/details/azure-maps/). If you're a current Azure Maps customer, you can learn how to change from Gen 1 to Gen 2 pricing [here](how-to-manage-pricing-tier.md).
+See the **pricing tier targeted customers** table below for a better understanding of Gen 1 and Gen 2 pricing tiers.  For more information, see [Azure Maps pricing](https://azure.microsoft.com/pricing/details/azure-maps/). If you're a current Azure Maps customer, you can learn how to change from Gen 1 to Gen 2 pricing in the [Manage pricing tier](how-to-manage-pricing-tier.md) article.
 
 | Pricing tier  | SKU | Targeted Customers|
-|-----------------|----| -----------------|
-| **Gen 1** | S0          |    The S0 pricing tier works for applications in all stages of production: from proof-of-concept development and early stage testing to application production and deployment. However, this tier is designed for small-scale development, or customers with low concurrent users, or both.
-|        |S1           |    The S1 pricing tier is for customers with large-scale enterprise applications, mission-critical applications, or high volumes of concurrent users. It's also for those customers who require advanced geospatial services.
-| **Gen 2** | Maps/Location Insights | Gen 2 pricing is for new and current Azure Maps customers. Gen 2 comes with a free monthly tier of transactions to be used to test and build on Azure maps. Maps and Location Insights SKU’s contain all of Azure Maps capabilities. Additionally, there’s no QPS (Queries Per Second) restrictions, which for most services, achieves cost savings as Azure Maps transactions increase.  
+|---------------|:---:| ------------------|
+|**Gen 1**|S0| The S0 pricing tier works for applications in all stages of production: from proof-of-concept development and early stage testing to application production and deployment. However, this tier is designed for small-scale development, or customers with low concurrent users, or both. S0 has a restriction of 50 QPS for all services combined.
+|         |S1| The S1 pricing tier is for customers with large-scale enterprise applications, mission-critical applications, or high volumes of concurrent users. It's also for those customers who require advanced geospatial services.
+| **Gen 2** | Maps/Location Insights | Gen 2 pricing is for new and current Azure Maps customers. Gen 2 comes with a free monthly tier of transactions to be used to test and build on Azure maps. Maps and Location Insights SKU’s contain all of Azure Maps capabilities. It allows you to achieve cost savings as Azure Maps transactions increases. Additionally, it has higher QPS limits than Gen 1.  
 |     |  |
 
+For more information on QPS limits, please refer to [Azure Maps QPS rate limits](azure-maps-qps-rate-limits.md).
+
 ## Next steps
 
 Learn more about how to view and change pricing tiers:

articles/azure-monitor/agents/azure-monitor-agent-install.md

@@ -35,14 +35,17 @@ The Azure Monitor Agent is implemented as an [Azure VM extension](../../virtual-
 | TypeHandlerVersion  | 1.0 | 1.5 |
 
 ## Extension versions
-It is strongly recommended to update to GA+ versions instead of using preview versions.
+It is strongly recommended to update to GA+ versions listed below instead of using preview or intermediate versions.
 
 | Release Date | Release notes | Windows | Linux |
 |:---|:---|:---|:---|:---|
 | June 2021 | General availability announced. <ul><li>All features except metrics destination now generally available</li><li>Production quality, security and compliance</li><li>Availability in all public regions</li><li>Performance and scale improvements for higher EPS</li></ul> [Learn more](https://azure.microsoft.com/updates/azure-monitor-agent-and-data-collection-rules-now-generally-available/) | 1.0.12.0 | 1.9.1.0 |
 | July 2021 | <ul><li>Support for direct proxies</li><li>Support for Log Analytics gateway</li></ul> [Learn more](https://azure.microsoft.com/updates/general-availability-azure-monitor-agent-and-data-collection-rules-now-support-direct-proxies-and-log-analytics-gateway/) | 1.1.1.0 | 1.10.5.0 |
-| August 2021 | Fixed issue allowing Azure Monitor Metrics as the only destination | 1.1.2.0 | 1.10.9.0 (do not use 1.10.7.0) |
-| September 2021 | <ul><li>Fixed issue causing data loss on restarting the agent</li><li>Addressed regression introduced in 1.1.3.1 for Arc Windows servers</li></ul> | 1.1.3.2 (do not use 1.1.3.1) | 1.12.2.0 |
+| August 2021 | Fixed issue allowing Azure Monitor Metrics as the only destination | 1.1.2.0 | 1.10.9.0<sup>1</sup> |
+| September 2021 | <ul><li>Fixed issue causing data loss on restarting the agent</li><li>Addressed regression introduced in 1.1.3.1<sup>2</sup> for Arc Windows servers</li></ul> | 1.1.3.2 | 1.12.2.0 <sup>2</sup> |  
+
+<sup>1</sup> Do not use AMA Linux version 1.10.7.0 
+<sup>2</sup> Known regression where it's not working on Arc-enabled servers
 
 
 ## Install with Azure portal

articles/azure-resource-manager/troubleshooting/find-error-code.md

@@ -3,7 +3,7 @@ title: Find error codes
 description: Describes how to find error codes to troubleshoot Azure resources deployed with Azure Resource Manager templates (ARM templates) or Bicep files.
 tags: top-support-issue
 ms.topic: troubleshooting
-ms.date: 11/02/2021
+ms.date: 11/04/2021
 ms.custom: devx-track-azurepowershell
 ---
 
@@ -13,17 +13,19 @@ When an Azure resource deployment fails using Azure Resource Manager templates (
 
 ## Error types
 
-There are three types of errors you can receive:
+There are three types of errors that are related to a deployment:
 
-- **Validation errors** occur before a deployment begins and are caused by syntax errors. To identify validation errors, use [Visual Studio Code](https://code.visualstudio.com) with the latest [Bicep extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-bicep) or [Azure Resource Manager Tools extension](https://marketplace.visualstudio.com/items?itemName=msazurermtools.azurerm-vscode-tools).
-- **Preflight validation errors** occur when the deployment begins but resources aren't deployed. For example, an incorrect parameter value or invalid resource name.
-- **Deployment errors** occur during deployment and troubleshooting is needed to find the cause.
+- **Validation errors** occur before a deployment begins and are caused by syntax errors in your file. Your editor can identify these errors.
+- **Preflight validation errors** occur when a deployment command is run but resources aren't deployed. These errors are found without starting the deployment. For example, if a parameter value is incorrect, the error is found in preflight validation.
+- **Deployment errors** occur during the deployment process and can only be found by assessing the deployment's progress.
 
-Validation and preflight error codes are reported in a resource group's activity log, and the subscription's [activity log](../../azure-monitor/essentials/activity-log.md). An exception is Bicep syntax validation that's only shown in the editor or deployment command's output. Deployment error codes are shown in a resource group's deployment history and activity log.
+All types of errors return an error code that you use to troubleshoot the deployment. Validation and preflight errors are shown in the activity log but don't appear in your deployment history. A Bicep file with syntax errors doesn't compile into JSON and isn't shown in the activity log.
+
+To identify syntax errors, you can use [Visual Studio Code](https://code.visualstudio.com) with the latest [Bicep extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-bicep) or [Azure Resource Manager Tools extension](https://marketplace.visualstudio.com/items?itemName=msazurermtools.azurerm-vscode-tools).
 
 ## Validation errors
 
-Templates are validated during the deployment process and error codes are displayed. Before you run a deployment, you can run validation tests with Azure PowerShell or Azure CLI.
+Templates are validated during the deployment process and error codes are displayed. Before you run a deployment, you can run validation tests with Azure PowerShell or Azure CLI to identify validation and preflight errors.
 
 # [Portal](#tab/azure-portal)
 
@@ -39,7 +41,7 @@ Select the message for more details. The template has a syntax error with error
 
 # [PowerShell](#tab/azure-powershell)
 
-To validate an ARM template before deployment run [Test-AzResourceGroupDeployment](/powershell/module/az.resources/test-azresourcegroupdeployment). The same error is shown when you run a deployment.
+To validate an ARM template before deployment run [Test-AzResourceGroupDeployment](/powershell/module/az.resources/test-azresourcegroupdeployment).
 
 ```azurepowershell
 Test-AzResourceGroupDeployment `
@@ -76,7 +78,7 @@ There are more PowerShell cmdlets available to validate deployment templates:
 
 # [Azure CLI](#tab/azure-cli)
 
-To validate an ARM template before deployment, run [az deployment group validate](/cli/azure/deployment/group#az_deployment_group_validate). The same error is shown when you run a deployment.
+To validate an ARM template before deployment, run [az deployment group validate](/cli/azure/deployment/group#az_deployment_group_validate).
 
 ```azurecli
 az deployment group validate \