Skip to content

Commit fb4d523

Browse files
authored
Merge pull request #112775 from dcurwin/april26-2020
Formatting changes
2 parents 1323575 + 4d60c8b commit fb4d523

35 files changed

+313
-318
lines changed

articles/backup/azure-policy-configure-diagnostics.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.date: 02/14/2020
88

99
The reporting solution provided by Azure Backup leverages Log Analytics (LA). For the data of any given vault to be sent to LA, a [diagnostics setting](https://docs.microsoft.com/azure/backup/backup-azure-diagnostic-events) needs to be created for that vault.
1010

11-
Often, adding a diagnostics setting manually per vault can be a cumbersome task. In addition, any new vault created also needs to have diagnostics settings enabled in order to be able to view reports for this vault.
11+
Often, adding a diagnostics setting manually per vault can be a cumbersome task. In addition, any new vault created also needs to have diagnostics settings enabled in order to be able to view reports for this vault.
1212

1313
To simplify the creation of diagnostics settings at scale (with LA as the destination), Azure Backup provides a built-in [Azure Policy](https://docs.microsoft.com/azure/governance/policy/). This policy adds an LA diagnostics setting to all vaults in a given subscription or resource group. The following sections provide instructions on how to use this policy.
1414

@@ -30,30 +30,30 @@ To assign the policy for vaults in the required scope, follow the steps below:
3030
2. Select **Definitions** in the left menu to get a list of all built-in policies across Azure Resources.
3131
3. Filter the list for **Category=Monitoring**. Locate the policy named **[Preview]: Deploy Diagnostic Settings for Recovery Services Vault to Log Analytics workspace for resource specific categories**.
3232

33-
![Policy Definition Blade](./media/backup-azure-policy-configure-diagnostics/policy-definition-blade.png)
33+
![Policy Definition Blade](./media/backup-azure-policy-configure-diagnostics/policy-definition-blade.png)
3434

3535
4. Click on the name of the policy. You will be redirected to the detailed definition for this policy.
3636

37-
![Detailed Policy Definition](./media/backup-azure-policy-configure-diagnostics/detailed-policy-definition.png)
37+
![Detailed Policy Definition](./media/backup-azure-policy-configure-diagnostics/detailed-policy-definition.png)
3838

3939
5. Click on the **Assign** button at the top of the blade. This redirects you to the **Assign Policy** blade.
4040

4141
6. Under **Basics**, click on the three dots next to the **Scope** field. This opens up a right context blade where you can select the subscription for the policy to be applied on. You can also optionally select a resource group, so that the policy is applied only for vaults in a particular resource group.
4242

43-
![Policy Assignment Basics](./media/backup-azure-policy-configure-diagnostics/policy-assignment-basics.png)
43+
![Policy Assignment Basics](./media/backup-azure-policy-configure-diagnostics/policy-assignment-basics.png)
4444

4545
7. Under **Parameters**, enter the following information:
4646

47-
* **Profile Name** - The name that will be assigned to the diagnostics settings created by the policy.
48-
* **Log Analytics Workspace** - The Log Analytics Workspace to which the diagnostics setting should be associated. Diagnostics data of all vaults in the scope of the Policy assignment will be pushed to the specified LA Workspace.
47+
* **Profile Name** - The name that will be assigned to the diagnostics settings created by the policy.
48+
* **Log Analytics Workspace** - The Log Analytics Workspace to which the diagnostics setting should be associated. Diagnostics data of all vaults in the scope of the Policy assignment will be pushed to the specified LA Workspace.
4949

50-
* **Exclusion Tag Name (optional) and Exclusion Tag Value (optional)** - You can choose to exclude vaults containing a certain tag name and value from the policy assignment. For example, if you do **not** want a diagnostics setting to be added to those vaults which have a tag 'isTest' set to the value 'yes', you must enter 'isTest' in the **Exclusion Tag Name** field and 'yes' in the **Exclusion Tag Value** field. If any (or both) of these two fields are left empty, the policy will be applied to all relevant vaults irrespective of the tags they contain.
50+
* **Exclusion Tag Name (optional) and Exclusion Tag Value (optional)** - You can choose to exclude vaults containing a certain tag name and value from the policy assignment. For example, if you do **not** want a diagnostics setting to be added to those vaults which have a tag 'isTest' set to the value 'yes', you must enter 'isTest' in the **Exclusion Tag Name** field and 'yes' in the **Exclusion Tag Value** field. If any (or both) of these two fields are left empty, the policy will be applied to all relevant vaults irrespective of the tags they contain.
5151

52-
![Policy Assignment Parameters](./media/backup-azure-policy-configure-diagnostics/policy-assignment-parameters.png)
52+
![Policy Assignment Parameters](./media/backup-azure-policy-configure-diagnostics/policy-assignment-parameters.png)
5353

54-
8. **Create a remediation task** - Once the policy is assigned to a scope, any new vaults created in that scope automatically get LA diagnostics settings configured (within 30 minutes from the time of creation of the vault). To add a diagnostics setting to existing vaults in the scope, you can trigger a remediation task at policy assignment time. To trigger a remediation task, select the checkbox **Create a Remediation task**.
54+
8. **Create a remediation task** - Once the policy is assigned to a scope, any new vaults created in that scope automatically get LA diagnostics settings configured (within 30 minutes from the time of creation of the vault). To add a diagnostics setting to existing vaults in the scope, you can trigger a remediation task at policy assignment time. To trigger a remediation task, select the checkbox **Create a Remediation task**.
5555

56-
![Policy Assignment Remediation](./media/backup-azure-policy-configure-diagnostics/policy-assignment-remediation.png)
56+
![Policy Assignment Remediation](./media/backup-azure-policy-configure-diagnostics/policy-assignment-remediation.png)
5757

5858
9. Navigate to the **Review+Create** tab and click **Create**.
5959

@@ -62,15 +62,15 @@ To assign the policy for vaults in the required scope, follow the steps below:
6262
The remediation task is applied to vaults that are non-compliant according to the definition of the policy. A vault is non-compliant if it satisfies either of the following conditions:
6363

6464
* No diagnostics setting is present for the vault.
65-
* Diagnostic settings are present for the vault but neither of the settings has **all of** the Resource specific events enabled with LA as destination, and **Resource specific** selected in the toggle.
65+
* Diagnostic settings are present for the vault but neither of the settings has **all of** the Resource specific events enabled with LA as destination, and **Resource specific** selected in the toggle.
6666

6767
So even if a user has a vault with the AzureBackupReport event enabled in AzureDiagnostics mode (which is supported by Backup Reports), the remediation task will still apply to this vault, since the Resource specific mode is the recommended way of creating diagnostics settings, [going forward](https://docs.microsoft.com/azure/backup/backup-azure-diagnostic-events#legacy-event).
6868

6969
Further, if a user has a vault with only a subset of the six Resource specific events enabled, the remediation task will apply for this vault, since Backup Reports will work as expected only if all of the six Resource specific events are enabled.
7070

7171
> [!NOTE]
7272
>
73-
> If a vault has an existing diagnostics setting with a **subset of Resource specific** categories enabled, configured to send data to a particular LA Workspace, say 'Workspace X', then the remediation task will fail (for that vault alone) if the destination LA Workspace provided in the Policy assignment is the **same** 'Workspace X'.
73+
> If a vault has an existing diagnostics setting with a **subset of Resource specific** categories enabled, configured to send data to a particular LA Workspace, say 'Workspace X', then the remediation task will fail (for that vault alone) if the destination LA Workspace provided in the Policy assignment is the **same** 'Workspace X'.
7474
>
7575
>This is because, if the events enabled by two different diagnostics settings on the same resource **overlap** in some form, then the settings cannot have the same LA Workspace as the destination. You will have to manually resolve this failure, by navigating to the relevant vault and configuring a diagnostics setting with a different LA Workspace as the destination.
7676
>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Azure Backup provides a number of ways to restore a VM.
1818
**Create a new VM** | Quickly creates and gets a basic VM up and running from a restore point.<br/><br/> You can specify a name for the VM, select the resource group and virtual network (VNet) in which it will be placed, and specify a storage account for the restored VM. The new VM must be created in the same region as the source VM.
1919
**Restore disk** | Restores a VM disk, which can then be used to create a new VM.<br/><br/> Azure Backup provides a template to help you customize and create a VM. <br/><br> The restore job generates a template that you can download and use to specify custom VM settings, and create a VM.<br/><br/> The disks are copied to the Resource Group you specify.<br/><br/> Alternatively, you can attach the disk to an existing VM, or create a new VM using PowerShell.<br/><br/> This option is useful if you want to customize the VM, add configuration settings that weren't there at the time of backup, or add settings that must be configured using the template or PowerShell.
2020
**Replace existing** | You can restore a disk, and use it to replace a disk on the existing VM.<br/><br/> The current VM must exist. If it's been deleted, this option can't be used.<br/><br/> Azure Backup takes a snapshot of the existing VM before replacing the disk, and stores it in the staging location you specify. Existing disks connected to the VM are replaced with the selected restore point.<br/><br/> The snapshot is copied to the vault, and retained in accordance with the retention policy. <br/><br/> After the replace disk operation, the original disk is retained in the resource group. You can choose to manually delete the original disks if they are not needed. <br/><br/>Replace existing is supported for unencrypted managed VMs, including VMs [created using custom images](https://azure.microsoft.com/resources/videos/create-a-custom-virtual-machine-image-in-azure-resource-manager-with-powershell/). It is unsupported for classic VMs.<br/><br/> If the restore point has more or less disks than the current VM, then the number of disks in the restore point will only reflect the VM configuration.<br><br> Replace existing isn't supported for VMs with linked resources (like [user-assigned managed-identity](https://docs.microsoft.com/azure/active-directory/managed-identities-azure-resources/overview) or [Key Vault](https://docs.microsoft.com/azure/key-vault/key-vault-overview)) because the backup client-app doesn't have permissions on these resources while performing the restore.
21-
**Cross Region (secondary region)** | Cross Region restore can be used to restore Azure VMs in the secondary region, which is an [Azure paired region](https://docs.microsoft.com/azure/best-practices-availability-paired-regions#what-are-paired-regions).<br><br> You can restore all the Azure VMs for the selected recovery point if the backup is done in the secondary region.<br><br> This feature is available for the options below:<br> * [Create a VM](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#create-a-vm) <br> * [Restore Disks](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#restore-disks) <br><br> We don't currently support the [Replace existing disks](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#replace-existing-disks) option.<br><br> Permissions<br> The restore operation on secondary region can be performed by Backup Admins and App admins.
21+
**Cross Region (secondary region)** | Cross Region restore can be used to restore Azure VMs in the secondary region, which is an [Azure paired region](https://docs.microsoft.com/azure/best-practices-availability-paired-regions#what-are-paired-regions).<br><br> You can restore all the Azure VMs for the selected recovery point if the backup is done in the secondary region.<br><br> This feature is available for the options below:<br> <li> [Create a VM](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#create-a-vm) <br> <li> [Restore Disks](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#restore-disks) <br><br> We don't currently support the [Replace existing disks](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#replace-existing-disks) option.<br><br> Permissions<br> The restore operation on secondary region can be performed by Backup Admins and App admins.
2222

2323
> [!NOTE]
2424
> You can also recover specific files and folders on an Azure VM. [Learn more](backup-azure-restore-files-from-vm.md).

articles/backup/backup-azure-backup-import-export.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The following Azure Backup features or workloads support the use of offline back
3030
> * Backup of files and folders with the Microsoft Azure Recovery Services (MARS) Agent, also referred to as the Azure Backup Agent.
3131
> * Backup of all workloads and files with System Center Data Protection Manager (DPM).
3232
> * Backup of all workloads and files with Microsoft Azure Backup Server.
33-
33+
3434
> [!NOTE]
3535
> Offline backup isn't supported for system state backups done by using the Azure Backup Agent.
3636

articles/backup/backup-azure-backup-server-import-export-.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ The information in this section helps you finish the offline backup workflow so
131131
![Import page](./media/backup-azure-backup-import-export/offlineBackupscreenInputs.png)
132132
133133
Here's the corresponding page in DPM. <br/>
134-
134+
135135
![DPM and Azure Backup Server import page](./media/backup-azure-backup-import-export/dpmoffline.png)
136136
137137
The boxes that you fill in are:
@@ -236,7 +236,7 @@ The *AzureOfflineBackupDiskPrep* utility is used to prepare the SATA drives that
236236
![Store shipping information](./media/backup-azure-backup-import-export/storingshippinginformation.png)<br/>
237237
238238
> [!IMPORTANT]
239-
> Ensure that the drives reach the Azure datacenter within two weeks of providing the shipping information by using the *AzureOfflineBackupDiskPrep* utility. Failure to do so can result in the drives not being processed.
239+
> Ensure that the drives reach the Azure datacenter within two weeks of providing the shipping information by using the *AzureOfflineBackupDiskPrep* utility. Failure to do so can result in the drives not being processed.
240240
241241
After you finish the previous steps, the Azure datacenter is ready to receive the drives and further process them to transfer the backup data from the drives to the classic-type Azure storage account you created.
242242

articles/backup/backup-azure-backup-sql.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ To back up a SQL Server database to Azure and to recover it from Azure:
1818

1919
## Before you start
2020

21-
Before you begin, ensure you've met the [prerequisites](backup-azure-dpm-introduction.md#prerequisites-and-limitations) for using Azure Backup to protect workloads. Here are some of the prerequisite tasks:
21+
Before you begin, ensure you've met the [prerequisites](backup-azure-dpm-introduction.md#prerequisites-and-limitations) for using Azure Backup to protect workloads. Here are some of the prerequisite tasks:
22+
2223
* Create a backup vault.
23-
* Download vault credentials.
24+
* Download vault credentials.
2425
* Install the Azure Backup agent.
2526
* Register the server with the vault.
2627

27-
## Create a backup policy
28+
## Create a backup policy
2829

2930
To protect SQL Server databases in Azure, first create a backup policy:
3031

@@ -68,7 +69,7 @@ To protect SQL Server databases in Azure, first create a backup policy:
6869
The initial backup copy requires the transfer of the entire data source (SQL Server database). The backup data moves from the production server (SQL Server machine) to the DPM server. If this backup is large, then transferring the data over the network could cause bandwidth congestion. For this reason, administrators can choose to use removable media to transfer the initial backup **Manually**. Or they can transfer the data **Automatically over the network** at a specified time.
6970

7071
After the initial backup finishes, backups continue incrementally on the initial backup copy. Incremental backups tend to be small and are easily transferred across the network.
71-
72+
7273
1. Choose when to run a consistency check. Then select **Next**.
7374

7475
![Choose when to run a consistency check](./media/backup-azure-backup-sql/pg-consistent.png)
@@ -100,7 +101,7 @@ To protect SQL Server databases in Azure, first create a backup policy:
100101
* The backup on Saturday at 12:00 PM is kept for 104 weeks.
101102
* The backup from the last Saturday of the month at 12:00 PM is kept for 60 months.
102103
* The backup from the last Saturday of March at 12:00 PM is kept for 10 years.
103-
104+
104105
After you choose a retention policy, select **Next**.
105106

106107
1. Choose how to transfer the initial backup copy to Azure.

articles/backup/backup-azure-delete-vault.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ First, read the **[Before you start](#before-you-start)** section to understand
8484

8585
Review the warning message and the instructions in the consent check box.
8686
> [!NOTE]
87+
>
8788
>- If the protected server is synced with Azure services and backup items exist, the consent check box will display the number of dependent backup items and the link to view the backup items.
8889
>- If the protected server is not synced with Azure services and backup items exist, the consent check box will display only the number of backup items.
8990
>- If there are no backup items, the consent check box will ask for deletion.

0 commit comments

Comments
 (0)