Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Banani-Rath

articles/active-directory/saas-apps/facebook-work-accounts-provisioning-tutorial.md

@@ -40,7 +40,7 @@ The scenario outlined in this tutorial assumes that you already have the followi
 ## Step 1. Plan your provisioning deployment
 1. Learn about [how the provisioning service works](../app-provisioning/user-provisioning.md).
 1. Determine who will be in [scope for provisioning](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
-1. Determine what data to [map between Azure AD and Vonage](../app-provisioning/customize-application-attributes.md).
+1. Determine what data to [map between Azure AD and Facebook Work Accounts](../app-provisioning/customize-application-attributes.md).
 
 
 ## Step 2. Add Facebook Work Accounts from the Azure AD application gallery

articles/active-directory/standards/configure-azure-active-directory-for-fedramp-high-impact.md

@@ -42,7 +42,7 @@ The following is a list of FedRAMP resources:
 
 * [FedRAMP Security Assessment Framework](https://www.fedramp.gov/assets/resources/documents/FedRAMP_Security_Assessment_Framework.pdf)
 
-* [Agency Guide for FedRAMP Authorizations](https://www.fedramp.gov/assets/resources/documents/Agency_Guide_for_Reuse_of_FedRAMP_Authorizations.pdf)
+* [Agency Guide for FedRAMP Authorizations](https://www.fedramp.gov/assets/resources/documents/Agency_Authorization_Playbook.pdf)
 
 * [Managing compliance in the cloud at Microsoft](https://www.microsoft.com/trustcenter/common-controls-hub)
 

articles/app-service/app-service-hybrid-connections.md

@@ -5,7 +5,7 @@ author: madsd
 
 ms.assetid: 66774bde-13f5-45d0-9a70-4e9536a4f619
 ms.topic: article
-ms.date: 05/05/2021
+ms.date: 2/10/2022
 ms.author: madsd
 ms.custom: seodec18, fasttrack-edit
 ---
@@ -140,7 +140,7 @@ To support the Hybrid Connections it's configured with, HCM requires:
 
 - TCP access to Azure over port 443.
 - TCP access to the Hybrid Connection endpoint.
-- The ability to do DNS look-ups on the endpoint host and the Service Bus namespace.
+- The ability to do DNS look-ups on the endpoint host and the Service Bus namespace. In other words, the hostname in the Azure relay connection should be resolvable from the machine hosting the HCM.
 
 > [!NOTE]
 > Azure Relay relies on Web Sockets for connectivity. This capability is only available on Windows Server 2012 or later. Because of that, HCM is not supported on anything earlier than Windows Server 2012.

articles/app-service/environment/migrate.md

@@ -3,7 +3,7 @@ title: Migrate to App Service Environment v3 by using the migration feature
 description: Overview of the migration feature for migration to App Service Environment v3
 author: seligj95
 ms.topic: article
-ms.date: 2/2/2022
+ms.date: 2/10/2022
 ms.author: jordanselig
 ms.custom: references_regions
 ---
@@ -21,7 +21,6 @@ At this time, App Service Environment migrations to v3 using the migration featu
 
 - West Central US
 - Canada Central
-- Canada East
 - UK South
 - Germany West Central
 - East Asia

articles/automation/extension-based-hybrid-runbook-worker-install.md

@@ -3,7 +3,7 @@ title: Create and manage action groups in the Azure portal
 description: Learn how to create and manage action groups in the Azure portal.
 author: dkamstra
 ms.topic: conceptual
-ms.date: 01/15/2022
+ms.date: 02/10/2022
 ms.author: dukek
 ms.custom: references_regions
 ---
@@ -182,10 +182,7 @@ While setting up *Email ARM Role*, you need to make sure below three conditions
 > [!NOTE]
 > It can take upto **24 hours** for customer to start receiving notifications after they add new ARM Role to their subscription.
 
-### Event hub (preview)
-> [!NOTE]
-> The event hub action type is currently in *Preview*. During the preview there may be bugs and disruptions in availability of the functionality.
-
+### Event Hub
 An event hub action publishes notifications to [Azure Event Hubs](~/articles/event-hubs/event-hubs-about.md). You may then subscribe to the alert notification stream from your event receiver.
 
 ### Function
@@ -207,7 +204,8 @@ You may have a limited number of Logic App actions in an Action Group.
 The Action Groups Secure Webhook action enables you to take advantage of Azure Active Directory to secure the connection between your action group and your protected web API (webhook endpoint). The overall workflow for taking advantage of this functionality is described below. For an overview of Azure AD Applications and service principals, see [Microsoft identity platform (v2.0) overview](../../active-directory/develop/v2-overview.md).
 
 > [!NOTE]
-> Using the webhook action requires that the target webhook endpoint either doesn't require details of the alert to function successfully or it's capable of parsing the alert context information that's provided as part of the POST operation. If the webhook endpoint can't handle the alert context information on its own, you can use a solution like a [Logic App action](./action-groups-logic-app.md) for a custom manipulation of the alert context information to match the webhook's expected data format.
+> Using the webhook action requires that the target webhook endpoint be capable of processing the various JSON payloads emitted by different alert sources.
+> If the webhook endpoint is expecting a specific schema (for example Microsoft Teams) you should use the Logic App action to transform the alert schema to meet the target webhook's expectations.
 
 1. Create an Azure AD Application for your protected web API. See [Protected web API: App registration](../../active-directory/develop/scenario-protected-web-api-app-registration.md).
     - Configure your protected API to be [called by a daemon app](../../active-directory/develop/scenario-protected-web-api-app-registration.md#if-your-web-api-is-called-by-a-daemon-app).
@@ -368,8 +366,8 @@ Pricing for supported countries/regions is listed in the [Azure Monitor pricing
 ### Webhook
 
 > [!NOTE]
-> Using the webhook action requires that the target webhook endpoint either doesn't require details of the alert to function successfully or it's capable of parsing the alert context information that's provided as part of the POST operation. 
-> If the webhook endpoint can't handle the alert context information on its own, you can use a solution like a [Logic App action](./action-groups-logic-app.md) for a custom manipulation of the alert context information to match the webhook's expected data format.
+> Using the webhook action requires that the target webhook endpoint be capable of processing the various JSON payloads emitted by different alert sources.
+> If the webhook endpoint is expecting a specific schema (for example Microsoft Teams) you should use the Logic App action to transform the alert schema to meet the target webhook's expectations.
 
 Webhooks are processed using the following rules
 - A webhook call is attempted a maximum of three times.

articles/azure-monitor/alerts/action-groups.md

@@ -4,7 +4,7 @@ description: Common issues with Azure Monitor metric alerts and possible solutio
 author: harelbr
 ms.author: harelbr
 ms.topic: troubleshooting
-ms.date: 11/12/2021
+ms.date: 2/10/2022
 ---
 # Troubleshooting problems in Azure Monitor metric alerts 
 
@@ -108,7 +108,7 @@ Metric alerts are stateful by default, and therefore additional alerts are not f
 - If you're creating the alert rule programmatically (for example, via [Resource Manager](./alerts-metric-create-templates.md), [PowerShell](/powershell/module/az.monitor/), [REST](/rest/api/monitor/metricalerts/createorupdate), [CLI](/cli/azure/monitor/metrics/alert)), set the *autoMitigate* property to 'False'.
 - If you're creating the alert rule via the Azure portal, uncheck the 'Automatically resolve alerts' option (available under the 'Alert rule details' section).
 
-<sup>1</sup> For stateless metric alert rules, an alert will trigger only once every 10 minutes minimum, even if the frequency of evaluation is set to less than 10 minutes and the condition is still being met.
+<sup>1</sup> For stateless metric alert rules, an alert will trigger once every 5 minutes at a minimum, even if the frequency of evaluation is equal or less than 5 minutes and the condition is still being met.
 
 > [!NOTE] 
 > Making a metric alert rule stateless prevents fired alerts from becoming resolved, so even after the condition isn’t met anymore, the fired alerts will remain in a fired state until the 30 days retention period.

articles/azure-monitor/alerts/alerts-troubleshoot-metric.md

@@ -5,7 +5,7 @@ author: bwren
 ms.author: bwren
 services: azure-monitor
 ms.topic: sample
-ms.date: 05/18/2020
+ms.date: 02/10/2022
 ---
 # Resource Manager template samples for metric alert rules in Azure Monitor
 
@@ -88,7 +88,6 @@ The following sample creates a metric alert rule using a single criteria and a s
             "defaultValue": "GreaterThan",
             "allowedValues": [
                 "Equals",
-                "NotEquals",
                 "GreaterThan",
                 "GreaterThanOrEqual",
                 "LessThan",
@@ -804,7 +803,7 @@ For example, a few of the potential time series that are monitored by this alert
         }
     },
     "variables": { 
-        "criteria": "[array(parameters('criterion'))]"
+		"criteria": "[array(parameters('criterion'))]"
      },
     "resources": [
         {
@@ -1161,7 +1160,6 @@ Save the json below as customstaticmetricalert.json for the purpose of this walk
             "defaultValue": "GreaterThan",
             "allowedValues": [
                 "Equals",
-                "NotEquals",
                 "GreaterThan",
                 "GreaterThanOrEqual",
                 "LessThan",
@@ -1450,7 +1448,7 @@ Save the json below as all-vms-in-resource-group-static.json for the purpose of
             "type": "string",
             "minLength": 1,
             "metadata": {
-                "description": "Resource type of target resources to be monitored. Currently only supported resource type is Microsoft.Compute/virtualMachines"
+                "description": "Resource type of target resources to be monitored."
             }
         },
         "metricName": {
@@ -1465,7 +1463,6 @@ Save the json below as all-vms-in-resource-group-static.json for the purpose of
             "defaultValue": "GreaterThan",
             "allowedValues": [
                 "Equals",
-                "NotEquals",
                 "GreaterThan",
                 "GreaterThanOrEqual",
                 "LessThan",
@@ -1737,7 +1734,7 @@ This sample creates a dynamic thresholds metric alert rule that monitors Percent
             "type": "string",
             "minLength": 1,
             "metadata": {
-                "description": "Resource type of target resources to be monitored. Currently only supported resource type is Microsoft.Compute/virtualMachines"
+                "description": "Resource type of target resources to be monitored."
             }
         },
         "metricName": {
@@ -2046,7 +2043,7 @@ This sample creates a static threshold metric alert rule that monitors Percentag
             "type": "string",
             "minLength": 1,
             "metadata": {
-                "description": "Resource type of target resources to be monitored. Currently only supported resource type is Microsoft.Compute/virtualMachines"
+                "description": "Resource type of target resources to be monitored."
             }
         },
         "metricName": {
@@ -2061,7 +2058,6 @@ This sample creates a static threshold metric alert rule that monitors Percentag
             "defaultValue": "GreaterThan",
             "allowedValues": [
                 "Equals",
-                "NotEquals",
                 "GreaterThan",
                 "GreaterThanOrEqual",
                 "LessThan",
@@ -2222,6 +2218,7 @@ This sample creates a static threshold metric alert rule that monitors Percentag
 ### Dynamic Thresholds alert on all virtual machines in a subscription
 This sample creates a Dynamic Thresholds metric alert rule that monitors Percentage CPU for all virtual machines (in one Azure region) in a subscription.
 
+### Template file
 
 ```json
 {
@@ -2328,7 +2325,7 @@ This sample creates a Dynamic Thresholds metric alert rule that monitors Percent
             "type": "string",
             "minLength": 1,
             "metadata": {
-                "description": "Resource type of target resources to be monitored. Currently only supported resource type is Microsoft.Compute/virtualMachines"
+                "description": "Resource type of target resources to be monitored."
             }
         },
         "metricName": {
@@ -2527,7 +2524,8 @@ This sample creates a Dynamic Thresholds metric alert rule that monitors Percent
 ### Static threshold alert on a list of virtual machines
 This sample creates a static threshold metric alert rule that monitors Percentage CPU for a list of virtual machines in one Azure region in a subscription.
 
-### Parameter file
+### Template file
+
 ```json
 {
     "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
@@ -2633,7 +2631,7 @@ This sample creates a static threshold metric alert rule that monitors Percentag
             "type": "string",
             "minLength": 1,
             "metadata": {
-                "description": "Resource type of target resources to be monitored. Currently only supported resource type is Microsoft.Compute/virtualMachines"
+                "description": "Resource type of target resources to be monitored."
             }
         },
         "metricName": {
@@ -2648,7 +2646,6 @@ This sample creates a static threshold metric alert rule that monitors Percentag
             "defaultValue": "GreaterThan",
             "allowedValues": [
                 "Equals",
-                "NotEquals",
                 "GreaterThan",
                 "GreaterThanOrEqual",
                 "LessThan",
@@ -2813,7 +2810,7 @@ This sample creates a static threshold metric alert rule that monitors Percentag
 ### Dynamic Thresholds alert on a list of virtual machines
 This sample creates a dynamic thresholds metric alert rule that monitors Percentage CPU for a list of virtual machines in one Azure region in a subscription.
 
-### Parameter file
+### Template file
 
 ```json
 {
@@ -2920,7 +2917,7 @@ This sample creates a dynamic thresholds metric alert rule that monitors Percent
             "type": "string",
             "minLength": 1,
             "metadata": {
-                "description": "Resource type of target resources to be monitored. Currently only supported resource type is Microsoft.Compute/virtualMachines"
+                "description": "Resource type of target resources to be monitored."
             }
         },
         "metricName": {
@@ -3209,7 +3206,6 @@ This sample creates a dynamic thresholds metric alert rule that monitors Percent
         ],
         "evaluationFrequency": "PT1M",
         "windowSize": "PT5M",
-        "templateType": 0,
         "criteria": {
           "odata.type": "Microsoft.Azure.Monitor.WebtestLocationAvailabilityCriteria",
           "webTestId": "[resourceId('Microsoft.Insights/webtests', variables('pingTestName'))]",
@@ -3297,4 +3293,4 @@ Additional configuration of the content-match `pingText` parameter is controlled
 
 - [Get other sample templates for Azure Monitor](../resource-manager-samples.md).
 - [Learn more about alerts](./alerts-overview.md).
-- [Get a sample to create an action group with Resource Manager template](resource-manager-action-groups.md)
+- [Get a sample to create an action group with Resource Manager template](resource-manager-action-groups.md)

articles/azure-monitor/alerts/resource-manager-alerts-metric.md

@@ -93,7 +93,7 @@ You can use the CreateReleaseAnnotation PowerShell script to create annotations
         Id = [GUID]::NewGuid();
         AnnotationName = $releaseName;
         EventTime = (Get-Date).ToUniversalTime().GetDateTimeFormats("s")[0];
-        Category = "Deployment";
+        Category = "Deployment"; #Application Insights only displays annotations from the "Deployment" Category
         Properties = ConvertTo-Json $releaseProperties -Compress
     }
     
@@ -104,6 +104,9 @@ You can use the CreateReleaseAnnotation PowerShell script to create annotations
     # Invoke-AzRestMethod -Path "$aiResourceId/Annotations?api-version=2015-05-01" -Method PUT -Payload $body
     ```
 
+    [!NOTE]
+    Your annotations must have **Category** set to **Deployment** in order to be displayed in the Azure Portal.
+
 3. Call the PowerShell script with the following code, replacing the angle-bracketed placeholders with your values. The -releaseProperties are optional.
 
     ```powershell
@@ -155,6 +158,9 @@ Select any annotation marker to open details about the release, including reques
 
 Release annotations are a feature of the cloud-based Azure Pipelines service of Azure DevOps.
 
+> [!IMPORTANT]
+> Annotations using API keys is deprecated. We recommend using [Azure CLI](https://docs.microsoft.com/azure/azure-monitor/app/annotations#create-release-annotations-with-azure-cli) instead.
+
 ### Install the annotations extension (one time)
 
 To be able to create release annotations, you'll need to install one of the many Azure DevOps extensions available in the Visual Studio Marketplace.

articles/azure-monitor/app/annotations.md

@@ -381,6 +381,13 @@ namespace OIAPIExample
 ```
 
 ### Python sample
+
+>[!NOTE]
+> If using Python 2, you may need to change the line:
+> `bytes_to_hash = bytes(string_to_hash, encoding="utf-8")`
+> to
+> `bytes_to_hash = bytes(string_to_hash).encode("utf-8")`
+
 ```python
 import json
 import requests