Merge pull request #78667 from ThalathBhagya/master

Added Ad hoc backup retention

Author: American-Dipper

articles/backup/backup-azure-monitoring-use-azuremonitor.md

@@ -7,7 +7,7 @@ manager: shivamg
 keywords: Log Analytics; Azure Backup; Alerts; Diagnostic Settings; Action groups
 ms.service: backup
 ms.topic: conceptual
-ms.date: 02/26/2019
+ms.date: 06/04/2019
 ms.author: pullabhk
 ms.assetid: 01169af5-7eb0-4cb0-bbdb-c58ac71bf48b
 ---
@@ -41,7 +41,7 @@ You can select an LA workspace from another subscription as the target. *By sele
 
 ### Deploying solution to Log Analytics workspace
 
-Once the data is inside LA workspace, [deploy a github template](https://azure.microsoft.com/resources/templates/101-backup-oms-monitoring/) onto LA to visualize the data. Make sure you give the same resource group, workspace name, and workspace location to properly identify the workspace and then install this template on it.
+Once the data is inside LA workspace, [deploy a GitHub template](https://azure.microsoft.com/resources/templates/101-backup-oms-monitoring/) onto LA to visualize the data. Make sure you give the same resource group, workspace name, and workspace location to properly identify the workspace and then install this template on it.
 
 ### View Azure Backup data using Log Analytics (LA)
 
@@ -237,13 +237,13 @@ Apply the filters shown in the following picture to verify whether you are recei
 
 ![Activity logs for Azure VM backups](media/backup-azure-monitoring-laworkspace/activitylogs-azurebackup-vmbackups.png)
 
-You can click the “JSON” segment to get more details and view it by copy-pasting it onto a text editor. It should display the vault details and the item that triggered the activity log that is, the backup item.
+Click on the operation name it will display the operation and relevant details.
 
-Then click “Add activity log alert” to generate alerts for all such logs.
+![New alert rule](media/backup-azure-monitoring-laworkspace/new-alert-rule.png)
 
-You can click on "Add Activity log alert" shown above and it will open the alert creation screen that is similar to alert creation screen [as described above](#create-alerts-using-log-analytics).
+Click **New alert rule** to open the **Create rule** screen, here you can create alert using steps described in this [article](https://docs.microsoft.com/azure/azure-monitor/platform/alerts-activity-log).
 
-Here the resource is the RS vault itself and hence you need to repeat the same action for all the vaults in which you want notification via activity logs. The condition will not have any threshold, period, frequency since this is an event-based alert. As soon as the relevant activity log is generated, the alert is fired.
+Here the resource is the Recovery Service vault itself and hence you need to repeat the same action for all the vaults in which you want notification via activity logs. The condition will not have any threshold, period, frequency since this is an event-based alert. As soon as the relevant activity log is generated, the alert is fired.
 
 ## Recommendation
 

articles/backup/backup-configure-vault.md

@@ -6,7 +6,7 @@ author: rayne-wiselman
 manager: carmonm
 ms.service: backup
 ms.topic: conceptual
-ms.date: 03/13/2019
+ms.date: 06/04/2019
 ms.author: raynew
 ---
 
@@ -66,7 +66,7 @@ If your machine has limited internet access, ensure that firewall settings on th
 
 A Recovery Services vault stores all the backups and recovery points you create over time, and contains the backup policy applied to backed up machines. Create a vault as follows:
 
-1. Sign in to the [Azure Portal](https://portal.azure.com/) using your Azure subscription.
+1. Sign in to the [Azure portal](https://portal.azure.com/) using your Azure subscription.
 2. In search, type **Recovery Services** and click **Recovery Services vaults**.
 
     ![Create Recovery Services Vault step 1](./media/backup-try-azure-backup-in-10-mins/open-rs-vault-list.png)
@@ -160,7 +160,7 @@ Download the MARS agent for installation on machines you want to back up.
     - Save the encryption passphrase in a secure location.
     - If you lose or forget the passphrase, Microsoft can't help recover the backup data. Save the file in a secure location. You need it to restore a backup.
 
-7. click **Finish**. The agent is now installed and your machine is registered to the vault. You're ready to configure and schedule your backup.
+7. Click **Finish**. The agent is now installed and your machine is registered to the vault. You're ready to configure and schedule your backup.
 
 ## Create a backup policy
 
@@ -249,6 +249,14 @@ Enable network throttling as follows:
 
 After the initial backup is completed, the **Job completed** status appears in the Backup console.
 
+## Ad hoc backup policy retention behavior
+
+| Backup Policy for Scheduled Backup | Ad hoc Backup Retention
+| -- | --
+| Daily | **Default Retention**: Equivalent to the “retention in days for daily backups.” <br/><br/> **Exception**: If a daily scheduled backup is set for long-term retentions (Weeks, Months, Years) fails, then an ad hoc backup triggered right after this failed scheduled backup is considered for long-term retention. Otherwise, the next successful scheduled backup is considered for long-term retention.<br/><br/> **Example**: If all the (Weekly/Monthly/Yearly) retention backups are in failed state and you triggers a ad hoc backup then it will follow the Yearly retention period.
+| Weekly | **Default Retention** :  1 day. <br/> Ad hoc Backups taken for a data source with weekly Backup policy are deleted the very next day, even if they are the most recent Backups for the data source. <br/><br/> **Exception**: If a weekly scheduled backup is set for long-term retentions (Weeks, Months, Years) fails, then an ad hoc backup triggered right after this failed scheduled backup will be considered for long-term retention. Otherwise, the next successful scheduled backup is considered for long-term retention. <br/><br/> **Example**: If both the (Weekly/Monthly) retention backups are in failed state and you triggers a ad hoc backup then it will follow the Monthly retention period.
+
+
 ## Next steps
 
-[Learn how to](backup-azure-restore-windows-server.md) restore files.
+[Learn how to restore files](backup-azure-restore-windows-server.md).