Merge pull request #161324 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: ttorble

articles/active-directory-b2c/custom-policy-developer-notes.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 05/27/2021
+ms.date: 06/07/2021
 ms.custom: project-no-code
 ms.author: mimart
 ms.subservice: B2C
@@ -80,6 +80,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 | [Custom email verification](custom-email-mailjet.md) | NA | GA| |
 | [Customize the user interface with built-in templates](customize-ui.md) | GA| GA| |
 | [Customize the user interface with custom templates](customize-ui-with-html.md) | GA| GA| By using HTML templates. |
+| [Page layout version](page-layout.md) | GA | GA | |
 | [JavaScript](javascript-and-page-layout.md) | GA | GA | |
 | [Embedded sign-in experience](embedded-login.md) | NA |  Preview| By using the inline frame element `<iframe>`. |
 | [Password complexity](password-complexity.md) | GA | GA | |

articles/active-directory-b2c/javascript-and-page-layout.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 03/22/2021
+ms.date: 06/07/2021
 ms.custom: project-no-code, devx-track-js
 ms.author: mimart
 ms.subservice: B2C
@@ -59,7 +59,7 @@ To specify a page layout version for your user flow pages:
 
 1. In your Azure AD B2C tenant, select **User flows**.
 1. Select your policy (for example, "B2C_1_SignupSignin") to open it.
-1. Select **Page layouts**. Choose a **Layout name**, and then choose the **Page Layout Version (Preview)**.
+1. Select **Page layouts**. Choose a **Layout name**, and then choose the **Page Layout Version**.
 
 For information about the different page layout versions, see the [Page layout version change log](page-layout.md).
 

articles/active-directory-b2c/media/javascript-and-page-layout/javascript-settings.png

@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 04/22/2021
+ms.date: 06/07/2021
 ms.custom: project-no-code
 ms.author: mimart
 ms.subservice: B2C
@@ -240,16 +240,18 @@ When you want to sign the user out of the application, it isn't enough to clear
 
 Upon a sign-out request, Azure AD B2C:
 
-1. Invalidates the Azure AD B2C cookie-based session.
 ::: zone pivot="b2c-user-flow"
-2. Attempts to sign out from federated identity providers
+1. Invalidates the Azure AD B2C cookie-based session.
+1. Attempts to sign out from federated identity providers
 ::: zone-end
+
 ::: zone pivot="b2c-custom-policy"
-3. Attempts to sign out from federated identity providers:
+1. Invalidates the Azure AD B2C cookie-based session.
+1. Attempts to sign out from federated identity providers:
    - OpenId Connect - If the identity provider well-known configuration endpoint specifies an `end_session_endpoint` location. The sign-out request doesn't pass the `id_token_hint` parameter. If the federated identity provider requires this parameter, the sign-out request will fail.
    - OAuth2 - If the [identity provider metadata](oauth2-technical-profile.md#metadata) contains the `end_session_endpoint` location.
    - SAML - If the [identity provider metadata](identity-provider-generic-saml.md) contains the `SingleLogoutService` location.
-4. Optionally, signs-out from other applications. For more information, see the [Single sign-out](#single-sign-out) section.
+1. Optionally, signs-out from other applications. For more information, see the [Single sign-out](#single-sign-out) section.
 
 > [!NOTE]
 > You can disable the sign out from federated identity providers, by setting the identity provider technical profile metadata `SingleLogoutEnabled` to `false`.

articles/active-directory-b2c/session-behavior.md

@@ -8,7 +8,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: tutorial
-ms.date: 05/21/2021
+ms.date: 06/07/2021
 ms.author: mimart
 ms.subservice: B2C
 zone_pivot_groups: b2c-policy-type
@@ -42,13 +42,13 @@ A user flow lets you determine how users interact with your application when the
 
 ::: zone pivot="b2c-user-flow"
 - If you don't have one already, [create an Azure AD B2C tenant](tutorial-create-tenant.md) that is linked to your Azure subscription.
-- [Register your application](tutorial-register-applications.md) in the tenant that you created so that it can communicate with Azure AD B2C.
+- [Register a web application](tutorial-register-applications.md), and [enable ID token implicit grant](tutorial-register-applications.md#enable-id-token-implicit-grant).
 ::: zone-end
 
 ::: zone pivot="b2c-custom-policy"
 
 - If you don't have one already, [create an Azure AD B2C tenant](tutorial-create-tenant.md) that is linked to your Azure subscription.
-- [Register your application](tutorial-register-applications.md) in the tenant that you created so that it can communicate with Azure AD B2C.
+- [Register a web application](tutorial-register-applications.md), and [enable ID token implicit grant](tutorial-register-applications.md#enable-id-token-implicit-grant).
 - [Create a Facebook application](identity-provider-facebook.md#create-a-facebook-application). Skip the prerequisites and the reset of the steps in the [Set up sign-up and sign-in with a Facebook account](identity-provider-facebook.md) article. Although a Facebook application is not required for using custom policies, it's used in this walkthrough to demonstrate enabling social login in a custom policy.
 
 ::: zone-end

articles/active-directory-b2c/tutorial-create-user-flows.md

@@ -166,7 +166,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: hello-world-ingress
-  namespace: ingress-basic
   annotations:
     kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
@@ -202,7 +201,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: hello-world-ingress-static
-  namespace: ingress-basic
   annotations:
     kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
@@ -224,7 +222,7 @@ spec:
 Create the ingress resource using the `kubectl apply -f hello-world-ingress.yaml` command.
 
 ```
-$ kubectl apply -f hello-world-ingress.yaml
+$ kubectl apply -f hello-world-ingress.yaml --namespace ingress-basic
 
 ingress.extensions/hello-world-ingress created
 ingress.extensions/hello-world-ingress-static created

articles/aks/ingress-basic.md

@@ -30,7 +30,7 @@ This template works for deploying storage accounts and app service plans, but yo
 
 1. Open [Azure Quickstart templates](https://azure.microsoft.com/resources/templates/)
 1. In **Search**, enter _deploy linux web app_.
-1. Select the tile with the title **Deploy a basic Linux web app**. If you have trouble finding it, here's the [direct link](https://azure.microsoft.com/resources/templates/101-webapp-basic-linux/).
+1. Select the tile with the title **Deploy a basic Linux web app**. If you have trouble finding it, here's the [direct link](https://azure.microsoft.com/en-us/resources/templates/webapp-basic-linux/).
 1. Select **Browse on GitHub**.
 1. Select _azuredeploy.json_.
 1. Review the template. In particular, look for the `Microsoft.Web/sites` resource.

articles/azure-resource-manager/templates/template-tutorial-quickstart-template.md

@@ -983,6 +983,23 @@ Within few seconds, you should see the following response in the OUTPUT window
 
 Status code of 200 indicates that the  pipeline topology was successfully deleted.
 
+## Playing back the recording
+
+You can examine the Video Analyzer video resource that was created by the live pipeline by logging in to the Azure portal and viewing the video.
+1. Open your web browser, and go to the [Azure portal](https://portal.azure.com/). Enter your credentials to sign in to the portal. The default view is your service dashboard.
+1. Locate your Video Analyzer account among the resources you have in your subscription, and open the account pane.
+1. Select **Videos** in the **Video Analyzers** list.
+1. You'll find a video listed with the name `sample-motion-video-camera001`. This is the name chosen in your pipeline topology file.
+1. Select the video.
+1. The video details page will open and the playback should start automatically.
+
+    <!--TODO: add image -- ![Video playback]() TODO: new screenshot is needed here -->
+
+
+> [!NOTE]
+> Because the source of the video was a container simulating a camera feed, the time stamps in the video are related to when you activated the live pipeline and when you deactivated it.
+    
+
 ## Clean up resources
 
 [!INCLUDE [prerequisites](./includes/common-includes/clean-up-resources.md)]

articles/azure-video-analyzer/video-analyzer-docs/detect-motion-record-video-clips-cloud.md

@@ -350,17 +350,15 @@ When you deactivate the live pipeline, the video sink node stops recording media
 
 This event indicates that recording has stopped. The subject section in applicationProperties references the video sink node in the live pipeline, which generated this message. The body section contains information about the output location. In this case, it's the name of the Video Analyzer resource into which video is recorded.
 
-## Video Analyzer video resource
+## Playing back the recording
 
 You can examine the Video Analyzer video resource that was created by the live pipeline by logging in to the Azure portal and viewing the video.
 1. Open your web browser, and go to the [Azure portal](https://portal.azure.com/). Enter your credentials to sign in to the portal. The default view is your service dashboard.
 1. Locate your Video Analyzer account among the resources you have in your subscription, and open the account pane.
 1. Select **Videos** in the **Video Analyzers** list.
-
-    <!--TODO: add image -- ![Video Analyzers videos]() ./media/event-based-video-recording-tutorial/videos.png -->
 1. You'll find a video listed with the name `sample-evr-video`. This is the name chosen in your pipeline topology file.
 1. Select the video.
-1. On the video details page, select playback option <!-- TODO: fix this-->
+1. The video details page will open and the playback should start automatically.
 
     <!--TODO: add image -- ![Video playback]() TODO: new screenshot is needed here -->
 

articles/azure-video-analyzer/video-analyzer-docs/record-event-based-live-video.md

@@ -117,16 +117,95 @@ To inactivate/resolve an active alert, you can select the list item correspondin
 
 ## Azure Monitor alerts for Azure Backup (preview)
 
-Azure Backup also provides alerts via Azure Monitor, to enable users to have a consistent experience for alert management across different Azure services, including backup. With Azure Monitor alerts, you can route alerts to any notification channel supported by Azure Backup such as email, ITSM, Webhook, Logic App and so on.
+Azure Backup also provides alerts via Azure Monitor, to enable users to have a consistent experience for alert management across different Azure services, including backup. With Azure Monitor alerts, you can route alerts to any notification channel supported by Azure Monitor such as email, ITSM, Webhook, Logic App and so on.
 
-Currently, this feature is available for Azure Databases for PostgreSQL Server, Azure Blobs and Azure Managed Disks. Alerts are generated for the following scenarios and can be accessed by navigating to a Backup vault and clicking on the **Alerts** menu item:
+Currently, Azure Backup has made two main types of built-in alerts available:
 
-- Delete Backup Data
-- Backup Failure (to get alerts for Backup Failure, you need to register the AFEC flag named **EnableAzureBackupJobFailureAlertsToAzureMonitor** via the preview portal)
-- Restore Failure (to get alerts for Restore Failure, you  need to register the AFEC flag named **EnableAzureBackupJobFailureAlertsToAzureMonitor** via the preview portal)
+* **Security Alerts**: For scenarios, such as deletion of backup data, or disabling of soft-delete functionality for a vault, security alerts (of severity Sev 0) are fired, and displayed in the Azure portal or consumed via other clients (PowerShell, CLI and REST API). Security alerts are generated by default and can't be turned off. However, you can control the scenarios for which the notifications (for example, emails) should be fired. For more information on how to configure notifications, see [Action rules](../azure-monitor/alerts/alerts-action-rules.md).
+* **Job Failure Alerts**: For scenarios, such as backup failure and restore failure, Azure Backup provides built-in alerts via Azure Monitor (of Severity Sev 1). Unlike security alerts, you can choose to turn off Azure Monitor alerts for job failure scenarios. For example, if you have already configured custom alert rules for job failures via Log Analytics, and don't need built-in alerts to be fired for every job failure. By default, alerts for job failures are turned off. Refer to the [section on turning on alerts for these scenarios](#turning-on-azure-monitor-alerts-for-job-failure-scenarios) for more details.
+ 
+The following table summarizes the different backup alerts currently available (in preview) via Azure Monitor and the supported workload/vault types:
+
+| **Alert Category** | **Alert Name** | **Supported workload types / vault types** | **Description** | 
+| ------------------ | -------------  | ------------------------------------------ | -------- |
+| Security | Delete Backup Data | <li> Azure Virtual Machine <br><br> <li> SQL in Azure VM (non-AG scenarios) <br><br> <li> SAP HANA in Azure VM <br><br> <li> Azure Backup Agent <br><br> <li> DPM <br><br> <li> Azure Backup Server <br><br> <li> Azure Database for PostgreSQL Server <br><br> <li> Azure Blobs <br><br> <li> Azure Managed Disks  | This alert is fired when a user stops backup and deletes backup data (Note – If soft-delete feature is disabled for the vault, Delete Backup Data alert is not received) |
+| Security | Upcoming Purge | <li> Azure Virtual Machine <br><br> <li> SQL in Azure VM (non-AG scenarios) <br><br> <li> SAP HANA in Azure VM | For all workloads which support soft-delete, this alert is fired when the backup data for an item is 2 days away from being permanently purged by the Azure Backup service | 
+| Security | Purge Complete | <li> Azure Virtual Machine <br><br> <li> SQL in Azure VM (non-AG scenarios) <br><br> <li> SAP HANA in Azure VM | Delete Backup Data |
+| Security | Soft Delete Disabled for Vault | Recovery Services vaults | This alert is fired when the soft-deleted backup data for an item has been permanently deleted by the Azure Backup service | 
+| Jobs | Backup Failure | <li> Azure Virtual Machine <br><br> <li> SQL in Azure VM (non-AG scenarios) <br><br> <li> SAP HANA in Azure VM <br><br> <li> Azure Backup Agent <br><br> <li> Azure Files <br><br> <li> Azure Database for PostgreSQL Server <br><br> <li> Azure Blobs <br><br> <li> Azure Managed Disks | This alert is fired when a backup job failure has occurred. By default, alerts for backup  failures are turned off. Refer to the [section on turning on alerts for this scenario](#turning-on-azure-monitor-alerts-for-job-failure-scenarios) for more details. | 
+| Jobs | Restore Failure | <li> Azure Virtual Machine <br><br> <li> SQL in Azure VM (non-AG scenarios) <br><br> <li> SAP HANA in Azure VM <br><br> <li> Azure Backup Agent <br><br> <li> Azure Files <br><br> <li> Azure Database for PostgreSQL Server <br><br> <li> Azure Blobs <br><br> <li> Azure Managed Disks| This alert is fired when a restore job failure has occurred. By default, alerts for restore failures are turned off. Refer to the [section on turning on alerts for this scenario](#turning-on-azure-monitor-alerts-for-job-failure-scenarios) for more details. | 
+
+### Turning on Azure Monitor alerts for job failure scenarios
+
+To opt-in to Azure Monitor alerts for backup failure and restore failure scenarios, follow the below steps:
+
+1. Navigate to the Azure portal and search for **Preview Features**.
+
+    ![Preview Features](media/backup-azure-monitoring-laworkspace/portal-preview-features.png)
+
+2. You can view the list of all preview features that are available for you to opt-in to.
+
+    * If you wish to receive job failure alerts for workloads backed up to Recovery Services vaults, select the flag named **EnableAzureBackupJobFailureAlertsToAzureMonitor** corresponding to Microsoft.RecoveryServices provider (column 3).
+    * If you wish to receive job failure alerts for workloads backed up to Backup vaults, select the flag named **EnableAzureBackupJobFailureAlertsToAzureMonitor** corresponding to Microsoft.DataProtection provider (column 3).
+
+    ![Alerts Preview](media/backup-azure-monitoring-laworkspace/alert-preview-feature-flags.png)
+
+3. Click **Register** to enable this feature for your subscription.
+    > [!NOTE]
+    > It may take up to 30 minutes for the registration to take effect. If you wish to enable this feature for multiple subscriptions, repeat the above process by selecting the relevant subscription at the top of the screen.
+
+
+### Viewing fired alerts in the Azure portal 
+
+Once an alert is fired for a vault, you can view the alert in the Azure portal by navigating to the vault and clicking on the **Alerts** menu item. Clicking this shows a distribution of alerts by severity for this vault.
+
+![Viewing Alerts](media/backup-azure-monitoring-laworkspace/vault-azure-monitor-alerts.png)
+
+Clicking on any of the numbers opens up a list of all alerts fired with the given severity. You can click any of the alerts to get more details about the alert, such as the affected datasource, alert description and recommended action, and so on.
+
+![Alert Details](media/backup-azure-monitoring-laworkspace/azure-monitor-alert-details.png) 
+
+You can change the state of an alert to **Acknowledged** or **Closed** by clicking on **Change Alert State**.
+
+![Change Alert State](media/backup-azure-monitoring-laworkspace/azure-monitor-change-alert-state.png) 
 
 For more information about Azure Monitor alerts, see [Overview of alerts in Azure](../azure-monitor/alerts/alerts-overview.md).
 
+### Configuring notifications for alerts
+
+To configure notifications for Azure Monitor alerts, you must create an action rule. The following steps demonstrate how to create an action rule to send email notifications to a given email address. Similar instructions will apply for routing these alerts to other notification channels, such as ITSM, webhook, logic app and so on.
+
+1. Navigate to **Azure Monitor** in the Azure portal. Click the **Alerts** menu item and select **Manage actions**.
+
+    ![Manage Actions](media/backup-azure-monitoring-laworkspace/azure-monitor-manage-actions.png) 
+
+2. Navigate to the **Action rules (preview)** tab and click **New action rule**.
+
+    ![New Action Rule](media/backup-azure-monitoring-laworkspace/azure-monitor-create-action-rule.png) 
+
+3. Select the scope for which the action rule should be applied. You can apply the action rule for all resources within a subscription. Optionally, you can also apply filters on the alerts, for example, to only generate notifications for alerts of a certain severity.
+
+    ![Action Rule Scope](media/backup-azure-monitoring-laworkspace/azure-monitor-action-rule-scope.png) 
+
+4. Create an action group. An action group is the destination to which the notification for an alert should be sent, for example, an email address.
+ 
+    ![Create Action Group](media/backup-azure-monitoring-laworkspace/azure-monitor-create-action-group.png) 
+
+5. On the **Basics** tab, select the name of the action group and the subscription and resource group under which it should be created.
+
+    ![Action Groups Basic](media/backup-azure-monitoring-laworkspace/azure-monitor-action-groups-basic.png) 
+
+6. On the **Notifications** tab, select **Email/SMS message/Push/Voice** and enter the recipient email id.
+
+    ![Action Groups Notification](media/backup-azure-monitoring-laworkspace/azure-monitor-email.png) 
+
+7. Click **Review+Create** and then **Create** to deploy the action group.
+
+8. Finally, save the action rule.
+
+[Learn more about Action Rules in Azure Monitor](../azure-monitor/alerts/alerts-action-rules.md)
+
+
 ## Next steps
 
 [Monitor Azure Backup workloads using Azure Monitor](backup-azure-monitoring-use-azuremonitor.md)