Merge pull request #153363 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: ttorble

.openpublishing.redirection.media-services.json

@@ -594,6 +594,21 @@
             "source_path_from_root": "/articles/media-services/azure-media-player/azure-media-player-release-notes.md",
             "redirect_url": "https://amp.azure.net/libs/amp/latest/docs/changelog.html",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/media-services/latest/encode-custom-presets-how-to.md",
+            "redirect_url": "transform-custom-presets-how-to",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/media-services/latest/encode-custom-preset-cli-how-to.md",
+            "redirect_url": "transform-custom-preset-cli-how-to",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/media-services/latest/encode-custom-preset-rest-how-to.md",
+            "redirect_url": "transform-custom-preset-rest-how-to",
+            "redirect_document_id": false
         }
     ]
 }

articles/application-gateway/rewrite-http-headers-url.md

@@ -154,6 +154,14 @@ A rewrite rule set contains:
       * **URL Query String**: The value to which the query string is to be rewritten to. 
       * **Re-evaluate path map**: Used to determine whether the URL path map is to be re-evaluated or not. If kept unchecked, the original URL path will be used to match the path-pattern in the URL path map. If set to true, the URL path map will be re-evaluated to check the match with the rewritten path. Enabling this switch helps in routing the request to a different backend pool post rewrite.
 
+## Rewrite configuration common pitfall
+
+* Enabling 'Re-evaluate path map' is not allowed for basic request routing rules. This is to prevent infinite evaluation loop for a basic routing rule.
+
+* There needs to be at least 1 conditional rewrite rule or 1 rewrite rule which does not have 'Re-evaluate path map' enabled for path-based routing rules to prevent infinite evaluation loop for a path-based routing rule.
+
+* Incoming requests would be terminated with a 500 error code in case a loop is created dynamically based on client inputs. The Application Gateway will continue to serve other requests without any degradation in such a scenario.
+
 ### Using URL rewrite or Host header rewrite with Web Application Firewall (WAF_v2 SKU)
 
 When you configure URL rewrite or host header rewrite, the WAF evaluation will happen after the modification to the request header or URL parameters (post-rewrite). And when you remove the URL rewrite or host header rewrite configuration on your Application Gateway, the WAF evaluation will be done before the header rewrite (pre-rewrite). This order ensures that WAF rules are applied to the final request that would be received by your backend pool.

articles/automanage/automanage-virtual-machines.md

@@ -72,7 +72,7 @@ The Automanage account will be granted **Contributor** and **Resource Policy Con
 
 ## Participating services
 
-:::image type="content" source="media\automanage-virtual-machines\intelligently-onboard-services.png" alt-text="Intelligently onboard services.":::
+:::image type="content" source="media\automanage-virtual-machines\intelligently-onboard-services-1.png" alt-text="Intelligently onboard services.":::
 
 For the complete list of participating Azure services, as well as their supported environment, see the following:
 - [Automanage for Linux](automanage-linux.md)

articles/automanage/media/automanage-virtual-machines/intelligently-onboard-services-1.png

@@ -160,7 +160,7 @@ You have used Visual Studio Code to create and publish a C# durable function app
 
 ::: zone pivot="code-editor-visualstudio"
 
-In this article, you learn how to Visual Studio 2019 to locally create and test a "hello world" durable function.  This function orchestrates and chains-together calls to other functions. You then publish the function code to Azure. These tools are available as part of the Azure development workload in Visual Studio 2019.
+In this article, you learn how to use Visual Studio 2019 to locally create and test a "hello world" durable function.  This function orchestrates and chains-together calls to other functions. You then publish the function code to Azure. These tools are available as part of the Azure development workload in Visual Studio 2019.
 
 ![Screenshot shows a Visual Studio 2019 window with a durable function.](./media/durable-functions-create-first-csharp/functions-vs-complete.png)
 

articles/availability-zones/az-region.md

@@ -12,7 +12,7 @@ ms.date: 09/22/2020
 This article describes the [common alert schema definitions](./alerts-common-schema.md) for Azure Monitor, including those for webhooks, Azure Logic Apps, Azure Functions, and Azure Automation runbooks. 
 
 Any alert instance describes the resource that was affected and the cause of the alert. These instances are described in the common schema in the following sections:
-* **Essentials**: A set of standardized fields, common across all alert types, which describe what resource the alert is on, along with additional common alert metadata (for example, severity or description). 
+* **Essentials**: A set of standardized fields, common across all alert types, which describe what resource the alert is on, along with additional common alert metadata (for example, severity or description). Definitions of severity can be found in the [alerts overview](alerts-overview.md#overview). 
 * **Alert context**: A set of fields that describes the cause of the alert, with fields that vary based on the alert type. For example, a metric alert includes fields like the metric name and metric value in the alert context, whereas an activity log alert has information about the event that generated the alert. 
 
 **Sample alert payload**
@@ -537,4 +537,4 @@ Any alert instance describes the resource that was affected and the cause of the
 ## Next steps
 
 - Learn more about the [common alert schema](./alerts-common-schema.md).
-- Learn [how to create a logic app that uses the common alert schema to handle all your alerts](./alerts-common-schema-integrations.md).
+- Learn [how to create a logic app that uses the common alert schema to handle all your alerts](./alerts-common-schema-integrations.md).

articles/azure-functions/durable/durable-functions-create-first-csharp.md

@@ -167,12 +167,11 @@ The `useTrackEvent` Hook is used to track any custom event that an application m
 import React, { useState, useEffect } from "react";
 import { useAppInsightsContext, useTrackEvent } from "@microsoft/applicationinsights-react-js";
 
-const ProductCart = () => {
+const MyComponent = () => {
     const appInsights = useAppInsightsContext();
-    const trackCheckout = useTrackEvent(appInsights, "Checkout");
-    const trackCartUpdate = useTrackEvent(appInsights, "Cart Updated");
     const [cart, setCart] = useState([]);
-    
+    const trackCheckout = useTrackEvent(appInsights, "Checkout", cart);
+    const trackCartUpdate = useTrackEvent(appInsights, "Cart Updated", cart);
     useEffect(() => {
         trackCartUpdate({ cartCount: cart.length });
     }, [cart]);
@@ -185,15 +184,16 @@ const ProductCart = () => {
     return (
         <div>
             <ul>
-                <li>Product 1 <button onClick={() => setCart([...cart, "Product 1"])}>Add to Cart</button>
-                <li>Product 2 <button onClick={() => setCart([...cart, "Product 2"])}>Add to Cart</button>
-                <li>Product 3 <button onClick={() => setCart([...cart, "Product 3"])}>Add to Cart</button>
-                <li>Product 4 <button onClick={() => setCart([...cart, "Product 4"])}>Add to Cart</button>
+                <li>Product 1 <button onClick={() => setCart([...cart, "Product 1"])}>Add to Cart</button></li>
+                <li>Product 2 <button onClick={() => setCart([...cart, "Product 2"])}>Add to Cart</button></li>
+                <li>Product 3 <button onClick={() => setCart([...cart, "Product 3"])}>Add to Cart</button></li>
+                <li>Product 4 <button onClick={() => setCart([...cart, "Product 4"])}>Add to Cart</button></li>
             </ul>
             <button onClick={performCheckout}>Checkout</button>
         </div>
     );
 }
+
 export default MyComponent;
 ```
 

articles/azure-monitor/alerts/alerts-common-schema-definitions.md

@@ -1,12 +1,9 @@
 ---
 title: Roles, permissions, and security in Azure Monitor
 description: Learn how to use Azure Monitor's built-in roles and permissions to restrict access to monitoring resources.
-author: johnkemnetz
 services: azure-monitor
-
 ms.topic: conceptual
 ms.date: 11/27/2017
-ms.author: johnkem
 ---
 # Roles, permissions, and security in Azure Monitor
 

articles/azure-monitor/app/javascript-react-plugin.md

@@ -171,17 +171,17 @@ List of one or more strings that define which monitors in health hierarchy will
 The following table lists the current available monitor names.
 
 | Type name | Name | Description |
-|:---|:---|:---|
-| root | root | Top level monitor representing virtual machine health. | |
-| cpu-utilization | cpu-utilization | CPU utilization monitor. | |
-| logical-disks | logical-disks | Aggregate monitor for health state of all monitored disks on Windows virtual machine. | |
-| logical-disks\|* | logical-disks\|C:<br>logical-disks\|D: | Aggregate monitor tracking health of a given disk on Windows virtual machine. | 
-| logical-disks\|*\|free-space | logical-disks\|C:\|free-space<br>logical-disks\|D:\|free-space | Disk free space monitor on Windows virtual machine. |
+|:----------|:-----|:------------|
+| root | root | Top level monitor representing virtual machine health. |
+| cpu-utilization | cpu-utilization | CPU utilization monitor. |
+| logical-disks | logical-disks | Aggregate monitor for health state of all monitored disks on Windows virtual machine. |
+| logical-disks\|\* | logical-disks\|C:<br>logical-disks\|D: | Aggregate monitor tracking health of a given disk on Windows virtual machine. |
+| logical-disks\|\*\|free-space | logical-disks\|C:\|free-space<br>logical-disks\|D:\|free-space | Disk free space monitor on Windows virtual machine. |
 | filesystems | filesystems | Aggregate monitor for health of all filesystems on Linux virtual machine. |
-| filesystems\|* | filesystems\|/<br>filesystems\|/mnt | Aggregate monitor tracking health of a filesystem of Linux virtual machine. | filesystems|/var/log |
-| filesystems\|*\|free-space | filesystems\|/\|free-space<br>filesystems\|/mnt\|free-space | Disk free space monitor on Linux virtual machine filesystem. | 
-| memory | memory | Aggregate monitor for health of virtual machine memory. | |
-| memory\|available| memory\|available | Monitor tracking available memory on the virtual machine. | |
+| filesystems\|\* | filesystems\|/<br>filesystems\|/mnt | Aggregate monitor tracking health of a filesystem of Linux virtual machine. |
+| filesystems\|\*\|free-space | filesystems\|/\|free-space<br>filesystems\|/mnt\|free-space | Disk free space monitor on Linux virtual machine filesystem. |
+| memory | memory | Aggregate monitor for health of virtual machine memory. |
+| memory\|available | memory\|available | Monitor tracking available memory on the virtual machine. |
 
 
 ## alertConfiguration element
@@ -271,4 +271,4 @@ For a sample data collection rule enabling guest monitoring, see [Enable a virtu
 
 ## Next steps
 
-- Read more about [data collection rules](../agents/data-collection-rule-overview.md).
+- Read more about [data collection rules](../agents/data-collection-rule-overview.md).