Merge pull request #100280 from dcurwin/a-jan72020

ttorble · web-flow · commit 3da9f9121754 · 2020-01-07T11:35:22.000Z
Multiple Changes
diff --git a/articles/backup/backup-azure-file-folder-backup-faq.md b/articles/backup/backup-azure-file-folder-backup-faq.md
@@ -72,9 +72,9 @@ The MARS agent relies on NTFS, and uses the filepath length specification limite
 
 The MARS agent relies on NTFS, and allows [supported characters](/windows/desktop/FileIO/naming-a-file#naming-conventions) in file names/paths.
 
-### The warning "Azure Backups have not been configured for this server" appears.
+### The warning "Azure Backups have not been configured for this server" appears
 
-This warning can appear even though you've configured a backup policy, when the backup schedule settings stored on the local server are not the same as the settings stored in the backup vault.
+This warning can appear even though you've configured a backup policy, when the backup schedule settings stored on the local server aren't the same as the settings stored in the backup vault.
 
 * When the server or the settings have been recovered to a known good state, backup schedules can become unsynchronized.
 * If you receive this warning, [configure](backup-azure-manage-windows-server.md) the backup policy again, and then run an on-demand backup to resynchronize the local server with Azure.
@@ -87,7 +87,7 @@ The size of the cache folder determines the amount of data that you are backing
 
 * The cache folder volumes should have free space that equals at least 5-10% of the total size of backup data.
 * If the volume has less than 5% free space, either increase the volume size, or move the cache folder to a volume with enough space.
-* If you backup Windows System State, you will need an additional 30-35 GB of free space in the volume containing the cache folder.
+* If you backup Windows System State, you'll need an additional 30-35 GB of free space in the volume containing the cache folder.
 
 ### How to check if scratch folder is valid and accessible?
 
@@ -126,9 +126,9 @@ The size of the cache folder determines the amount of data that you are backing
 
 ### Where should the cache folder be located?
 
-The following locations for the cache folder are not recommended:
+The following locations for the cache folder aren't recommended:
 
-* Network share/removable media: The cache folder must be local to the server that needs backing up using online backup. Network locations or removable media like USB drives are not supported
+* Network share/removable media: The cache folder must be local to the server that needs backing up using online backup. Network locations or removable media like USB drives aren't supported.
 * Offline volumes: The cache folder must be online for expected backup using Azure Backup Agent
 
 ### Are there any attributes of the cache folder that aren't supported?
@@ -141,48 +141,51 @@ The following attributes or their combinations are not supported for the cache f
 * Sparse
 * Reparse-Point
 
-The cache folder and the metadata VHD do not have the necessary attributes for the Azure Backup agent.
+The cache folder and the metadata VHD don't have the necessary attributes for the Azure Backup agent.
 
 ### Is there a way to adjust the amount of bandwidth used for backup?
 
 Yes, you can use the **Change Properties** option in the MARS agent to adjust the bandwidth and timing. [Learn more](backup-configure-vault.md#enable-network-throttling).
 
 ## Restore
+
 ### Manage
-**Can I recover if I forgot my passphrase?**<br>
-The Azure Backup agent requires a passphrase (that you provided during registration) to decrypt the backed up data during restore. Review the scenarios below to understand your options for handling a lost passphrase:<br>
+
+**Can I recover if I forgot my passphrase?**
+The Azure Backup agent requires a passphrase (that you provided during registration) to decrypt the backed-up data during restore. Review the scenarios below to understand your options for handling a lost passphrase:
 
 | Original Machine <br> *(source machine where backups were taken)* | Passphrase | Available Options |
 | --- | --- | --- |
-| Available |Lost |If your original machine (where backups were taken) is available and still registered with the same Recovery Services vault, then you will be able to regenerate the passphrase by following these [steps](https://docs.microsoft.com/azure/backup/backup-azure-manage-mars#re-generate-passphrase).  |
+| Available |Lost |If your original machine (where backups were taken) is available and still registered with the same Recovery Services vault, then you can regenerate the passphrase by following these [steps](https://docs.microsoft.com/azure/backup/backup-azure-manage-mars#re-generate-passphrase).  |
 | Lost |Lost |Not possible to recover the data or data is not available |
 
 Consider the following conditions:
-- If you uninstall & re-register the agent on the same original machine with
-  - *Same passphrase*, then you will be able to restore your backed up data.<br>
-  - *Different passphrase*, then you will not be able to restore your backed up data.
--	If you install the agent on a *different machine* with<br>
-  - the same passphrase (used in the original machine), then you will be able to restore your backed up data.<br>
-  - a different passphrase, you will not be able to restore your backed up data.<br>
--	Additionally, if your original machine is corrupted (preventing you from regenerating the passphrase through the MARS console); but you are able to restore/access the original scratch folder used by the MARS agent, then you might be able to restore (if you forgot the password). For more assistance, contact Customer Support.
 
-**How do I recover if I lost my original machine (where backups were taken)?**<br>
+* If you uninstall and re-register the agent on the same original machine with
+  * *Same passphrase*, then you will be able to restore your backed-up data.
+  * *Different passphrase*, then you will not be able to restore your backed-up data.
+* If you install the agent on a *different machine* with
+  * *Same passphrase* (used in the original machine), then you will be able to restore your backed-up data.
+  * *Different passphrase*, you will not be able to restore your backed-up data.
+* If your original machine is corrupted (preventing you from regenerating the passphrase through the MARS console), but you can restore or access the original scratch folder used by the MARS agent, then you might be able to restore (if you forgot the password). For more assistance, contact Customer Support.
+
+**How do I recover if I lost my original machine (where backups were taken)?**
 
-If you have the same passphrase (that you provided during registration) of the original machine, then you can restore the backed up data to an alternate machine. Review the scenarios below to understand your restore options.
+If you have the same passphrase (that you provided during registration) of the original machine, then you can restore the backed-up data to an alternate machine. Review the scenarios below to understand your restore options.
 
 | Original Machine | Passphrase | Available Options |
 | --- | --- | --- |
-| 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, refer to this [article](https://docs.microsoft.com/azure/backup/backup-azure-restore-windows-server#use-instant-restore-to-restore-data-to-an-alternate-machine).
+| 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.
 
-### Does the MARS agent back up and restore ACLs set on files, Folders and volumes?
+### Does the MARS agent back up and restore ACLs set on files, folders, and volumes?
 
-* The MARS agent backs up ACLs set on files, folders and volumes
+* The MARS agent backs up ACLs set on files, folders, and volumes
 * For Volume Restore recovery option, the MARS agent provides an option to skip restoring ACL permissions to the file or folder being recovered
 * For the individual file and folders recovery option, the MARS agent will restore with ACL permissions (there is no option to skip ACL restore).
 
diff --git a/articles/backup/backup-configure-vault.md b/articles/backup/backup-configure-vault.md
@@ -260,17 +260,24 @@ Enable network throttling as follows:
 
 ## Run an on-demand backup
 
-1. In the MARS agent, click **Back Up Now**. This kicks off the initial replication over the network.
+1. In the MARS agent, click **Back Up Now**.
 
     ![Windows Server backup now](./media/backup-configure-vault/backup-now.png)
 
-2. In **Confirmation**, review the settings, and click **Back Up**.
-3. Click **Close** to close the wizard. If you do this before the backup finishes, the wizard continues to run in the background.
+2. If the MARS agent version is 2.0.9169.0 or newer, a custom retention can be set. In the **Retain Backup Till** section, choose a date from the presented calendar:
 
-After the initial backup is completed, the **Job completed** status appears in the Backup console.
+   ![Retain Backup calendar](./media/backup-configure-vault/mars-ondemand.png)
+
+3. In **Confirmation**, review the settings, and click **Back Up**.
+4. Click **Close** to close the wizard. If you do this before the backup finishes, the wizard continues to run in the background.
+5. After the initial backup is completed, the **Job completed** status appears in the Backup console.
 
 ## On-demand backup policy retention behavior
 
+>[!NOTE]
+>Applicable only to MARS agent versions older than 2.0.9169.0
+>
+
 * For more information, refer step 8 of [Create a backup policy](backup-configure-vault.md#create-a-backup-policy)
 
 | Backup Schedule option | How long will the backed-up data be retained?
diff --git a/articles/backup/backup-support-matrix-iaas.md b/articles/backup/backup-support-matrix-iaas.md
@@ -142,7 +142,7 @@ Back up VMs that are deployed from a custom image (third-party) |Supported.<br/>
 Back up VMs that are migrated to Azure| Supported.<br/><br/> To back up the VM, the VM agent must be installed on the migrated machine.
 Back up Multi-VM consistency | Azure Backup does not provide data and application consistency across multiple VMs.
 Backup with [Diagnostic Settings](https://docs.microsoft.com/azure/azure-monitor/platform/diagnostic-logs-overview)  | Unsupported. <br/><br/> If the restore of the Azure VM with diagnostic settings is triggered using [Create New](backup-azure-arm-restore-vms.md#create-a-vm) option, then the restore fails.
-Restore of Zone-pinned VMs | Supported (for VM that is backed-up after Jan 2019 and where [availability zone](https://azure.microsoft.com/global-infrastructure/availability-zones/) are available).<br/><br/>We currently support restoring to the same zone that is pinned in VMs. However, if the zone is unavailable, it will be restored in the most available zone. This is currently controlled by our service.
+Restore of Zone-pinned VMs | Supported (for VM that is backed-up after Jan 2019 and where [availability zone](https://azure.microsoft.com/global-infrastructure/availability-zones/) are available).<br/><br/>We currently support restoring to the same zone that is pinned in VMs. However, if the zone is unavailable, restore fails.
 Gen2 VMs | Supported <br> Azure Backup supports backup and restore of [Gen2 VMs](https://azure.microsoft.com/updates/generation-2-virtual-machines-in-azure-public-preview/). When these VMs are restored from Recovery point, they are restored as [Gen2 VMs](https://azure.microsoft.com/updates/generation-2-virtual-machines-in-azure-public-preview/).
 
 ## VM storage support
diff --git a/articles/backup/media/backup-configure-vault/mars-ondemand.png b/articles/backup/media/backup-configure-vault/mars-ondemand.png
diff --git a/includes/azure-backup-limits.md b/includes/azure-backup-limits.md
@@ -11,13 +11,4 @@ ms.custom: "include file"
 ---
 
 
-The following limits apply to Azure Backup.
-
-| **Limit** | **Default** |
-| --- | --- |
-| Servers or machines that can be registered in a vault. | Windows Server/Windows Client/System Center Data Protection Manager: 50. <br/><br/> IaaS VMs: 1,000.  |
-| Size of a data source in vault storage. |54,400-GB maximum. The limit doesn't apply to IaaS VM backup. |
-| Backup vaults in an Azure subscription. |500 vaults per region. |
-| Schedule daily backups. |Windows Server/Client: Three a day.<br/> System Center DPM: Two a day. <br/> IaaS VMs: Once a day.  |
-| Data disks attached to an Azure VM for backup. | 16 |
-| Individual data disk attached to Azure VM for backup.| 32 TB|
+For a summary of Azure Backup support settings and limitations, see [Azure Backup Support Matrices](https://docs.microsoft.com/azure/backup/backup-support-matrix).
