Merge pull request #111080 from MicrosoftDocs/master

Merge master to live Sunday 4:00 PM

Author: GitHubber17

.openpublishing.redirection.json

@@ -423,12 +423,17 @@
     },
     {
       "source_path": "articles/active-directory/saas-apps/realtimeboard-tutorial.md",
-      "redirect_url": "/articles/active-directory/saas-apps/miro-tutorial",
+      "redirect_url": "/azure/active-directory/saas-apps/miro-tutorial",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/active-directory/saas-apps/redbrickhealth-tutorial.md",
-      "redirect_url": "/articles/active-directory/saas-apps/redbrick-health-tutorial",
+      "redirect_url": "/azure/active-directory/saas-apps/redbrick-health-tutorial",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/saas-apps/adobe-identity-management-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
     {
@@ -40082,12 +40087,12 @@
     },
     {
       "source_path": "articles/iot-central/tutorial-add-device-pnp.md",
-      "redirect_url": "/azure/iot-central/core/tutorial-connect-pnp-device",
+      "redirect_url": "/azure/iot-central/core/quick-create-pnp-device",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/iot-central/tutorial-define-device-type-pnp.md",
-      "redirect_url": "/azure/iot-central/core/howto-set-up-template",
+      "redirect_url": "/azure/iot-central/core/quick-create-pnp-device",
       "redirect_document_id": false
     },
     {
@@ -46282,7 +46287,7 @@
     },
     {
       "source_path": "articles/iot-central/quick-create-pnp-device-pnp.md",
-      "redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
+      "redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
       "redirect_document_id": false
     },
     {
@@ -46347,12 +46352,7 @@
     },
     {
       "source_path": "articles/iot-central/core/quick-create-pnp-device-pnp.md",
-      "redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/iot-central/core/quick-create-pnp-device.md",
-      "redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
+      "redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
       "redirect_document_id": false
     },
     {
@@ -46787,7 +46787,7 @@
     },
     {
       "source_path": "articles/iot-central/preview/quick-create-pnp-device.md",
-      "redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
+      "redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
       "redirect_document_id": false
     },
     {

articles/active-directory/saas-apps/adobe-identity-management-tutorial.md

@@ -47,8 +47,6 @@
         href: adobe-creative-cloud-tutorial.md
       - name: Adobe Experience Manager
         href: adobeexperiencemanager-tutorial.md
-      - name: Adobe Identity Management
-        href: adobe-identity-management-tutorial.md
       - name: Adobe Sign
         href: adobe-echosign-tutorial.md
       - name: Adoddle cSaas Platform

articles/active-directory/saas-apps/toc.yml

@@ -88,7 +88,8 @@ When an alert rule is first created, the thresholds appearing in the chart are c
 
 ## How much data is needed to trigger an alert?
 
-If you have a new resource or missing metric data, Dynamic Thresholds won't trigger alerts before three days or 30 samples of metric data are available to ensure accurate thresholds.
+If you have a new resource or missing metric data, Dynamic Thresholds won't trigger alerts before three days and at least 30 samples of metric data are available, to ensure accurate thresholds.
+For existing resources with sufficient metric data, Dynamic Thresholds can trigger alerts immediately.
 
 ## Dynamic Thresholds best practices
 

articles/azure-monitor/platform/alerts-dynamic-thresholds.md

@@ -5,7 +5,7 @@ ms.subservice: logs
 ms.topic: conceptual
 author: yossi-y
 ms.author: yossiy
-ms.date: 04/08/2020
+ms.date: 04/12/2020
 
 ---
 # Azure Monitor customer-managed key configuration 
@@ -148,20 +148,43 @@ GET https://management.azure.com/subscriptions/ subscription-id/providers/Micros
 Authorization: Bearer <token>
 ```
 
-The body of the response from the operation contains information about the operation including *Status*. The asynchronous operations in this configuration and their statuses are:
+The response contains information about the operation and its *Status*. It can be one of the followings:
 
-* Creating a *Cluster* resource
-    * ProvisioningAccount -- ADX cluster is in provisioning 
-    * Succeeded -- provisioning is completed
-
-* Granting permissions to your Key Vault
-    * Updating -- Key identifier details update is in progress
-    * Succeeded -- update completed
+Operation is in progress
+```json
+{
+    "id": "Azure-AsyncOperation URL value from the GET operation",
+    "name": "operation-id", 
+    "status" : "InProgress", 
+    "startTime": "2017-01-06T20:56:36.002812+00:00",
+}
+```
 
-* Associating Log Analytics workspaces
-    * Linking -- workspace association to cluster is in progress
-    * Succeeded -- association completed
+Operation is completed
+```json
+{
+    "id": "Azure-AsyncOperation URL value from the GET operation",
+    "name": "operation-id", 
+    "status" : "Succeeded", 
+    "startTime": "2017-01-06T20:56:36.002812+00:00",
+    "endTime": "2017-01-06T20:56:56.002812+00:00",
+}
+```
 
+Operation failed
+```json
+{
+    "id": "Azure-AsyncOperation URL value from the GET operation",
+    "name": "operation-id", 
+    "status" : "Failed", 
+    "startTime": "2017-01-06T20:56:36.002812+00:00",
+    "endTime": "2017-01-06T20:56:56.002812+00:00",
+    "error" : { 
+        "code": "error-code",  
+        "message": "error-message" 
+    }
+}
+```
 
 ### Subscription whitelisting
 
@@ -215,7 +238,8 @@ The identity is assigned to the *Cluster* resource at creation time.
 
 **Response**
 
-200 OK and header when accepted.
+200 OK and header.
+
 >[!Important]
 > During the early access period of the feature, the ADX cluster is provisioned manually. While it takes the provisioning of the underly ADX cluster a while to complete, you can check the provisioning state in two ways:
 > 1. Copy the Azure-AsyncOperation URL value from the response and follow the [asynchronous operations status check](#asynchronous-operations-and-status-check).
@@ -317,7 +341,8 @@ Content-type: application/json
 
 **Response**
 
-200 OK and header when accepted.
+200 OK and header.
+
 >[!Important]
 > It takes the propagation of the Key identifier a few minutes to complete. You can check the provisioning state in two ways:
 > 1. Copy the Azure-AsyncOperation URL value from the response and follow the [asynchronous operations status check](#asynchronous-operations-and-status-check).
@@ -385,11 +410,12 @@ Content-type: application/json
 
 **Response**
 
-200 OK and header when accepted.
->[!Important]
-> Ingested data is stored encrypted with your managed key after association operation, which can take up to 90 minutes to complete. To check the workspace association state, copy the Azure-AsyncOperation URL value from the response and follow the [asynchronous operations status check](#asynchronous-operations-and-status-check).
+200 OK and header.
 
-You can verify if your workspace was associated to a Cluster resource by sending a GET request to [Workspaces – Get](https://docs.microsoft.com/rest/api/loganalytics/workspaces/get) and observing the response. The clusterResourceId indicates on the Cluster resource ID.
+>[!Important]
+> Ingested data is stored encrypted with your managed key after association operation, which can take up to 90 minutes to complete. You can check the workspace association state in two ways:
+> 1. Copy the Azure-AsyncOperation URL value from the response and follow the [asynchronous operations status check](#asynchronous-operations-and-status-check).
+> 2. Send a [Workspaces – Get](https://docs.microsoft.com/rest/api/loganalytics/workspaces/get) request and observe the response, associated workspace will have a clusterResourceId under "features".
 
 ```rest
 GET https://management.azure.com/subscriptions/<subscription-id>/resourcegroups/<resource-group-name>/providers/microsoft.operationalInsights/workspaces/<workspace-name>?api-version=2015-11-01-preview

articles/azure-monitor/platform/customer-managed-keys.md

@@ -22,8 +22,6 @@ Azure Backup provides a number of ways to restore a VM.
 
 > [!NOTE]
 > You can also recover specific files and folders on an Azure VM. [Learn more](backup-azure-restore-files-from-vm.md).
->
-> If you're running the [latest version](backup-instant-restore-capability.md) of Azure Backup for Azure VMs (known as Instant Restore), snapshots are kept for up to seven days, and you can restore a VM from snapshots before the backup data is sent to the vault. If you want to restore a VM from a backup from the last seven days, it's quicker to restore from the snapshot and not from the vault.
 
 ## Storage accounts
 

articles/backup/backup-azure-arm-restore-vms.md

@@ -18,7 +18,7 @@ The latest MARS agent used when backing up Windows Server machines, System Cente
 
 ### How long are vault credentials valid?
 
-Vault credentials expire after 48 hours. If the credentials file expires, download the file again from the Azure portal.
+Vault credentials expire after 10 days. If the credentials file expires, download the file again from the Azure portal.
 
 ### From what drives can I back up files and folders?
 
@@ -182,7 +182,6 @@ If you have the same passphrase (that you provided during registration) of the o
 | Lost |Available |You can install and register the MARS agent on another machine with the same passphrase that you provided during registration of the original machine. Choose **Recovery Option** > **Another location** to perform your restore. For more information, see this [article](https://docs.microsoft.com/azure/backup/backup-azure-restore-windows-server#use-instant-restore-to-restore-data-to-an-alternate-machine).
 | Lost |Lost |Not possible to recover the data or data is not available |
 
-
 ### What happens if I cancel an ongoing restore job?
 
 If an ongoing restore job is canceled, the restore process stops. All files restored before the cancellation stay in configured destination (original or alternate location), without any rollbacks.

articles/backup/backup-azure-file-folder-backup-faq.md

@@ -12,7 +12,7 @@ ms.workload: na
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: how-to
-ms.date: 02/20/2020
+ms.date: 04/10/2020
 ms.author: spelluru
 
 ---
@@ -33,6 +33,8 @@ To set up a classroom lab in a lab account, you must be a member of the **Lab Cr
     1. Specify a **name** for your lab. 
     2. Select the **size of the virtual machines** you need for the class. For the list of sizes available, see the [VM Sizes](#vm-sizes) section. 
     3. Select the **virtual machine image** that you want to use for the classroom lab. If you select a Linux image, you see an option to enable remote desktop connection for it. For details, see [Enable remote desktop connection for Linux](how-to-enable-remote-desktop-linux.md).
+
+        If you signed in using lab account owner credentials, you will see an option to enable more images for the lab. For more information, see [Enable images at the time of lab creation](specify-marketplace-images.md#enable-images-at-the-time-of-lab-creation).
     4. Review the **total price per hour** displayed on the page. 
     6. Select **Save**.