Skip to content

Commit bd4cb7c

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-search
2 parents 7d10d43 + e5057eb commit bd4cb7c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+106
-394
lines changed

articles/backup/backup-azure-vm-backup-faq.md

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This article answers common questions about backing up Azure VMs with the [Azure
1313

1414
### Which VM images can be enabled for backup when I create them?
1515

16-
When you create a VM, you can enable backup for VMs running [supported operating systems](backup-support-matrix-iaas.md#supported-backup-actions)
16+
When you create a VM, you can enable backup for VMs running [supported operating systems](backup-support-matrix-iaas.md#supported-backup-actions).
1717

1818
### Is the backup cost included in the VM cost?
1919

@@ -41,7 +41,7 @@ No. Specify the retention range for an on-demand backup job. By default, it's re
4141

4242
### I recently enabled Azure Disk Encryption on some VMs. Will my backups continue to work?
4343

44-
Provide permissions for Azure Backup to access Key Vault. Specify the permissions in PowerShell as described in the **Enable backup** section in the [Azure Backup PowerShell](backup-azure-vms-automation.md) documentation.
44+
Provide permissions for Azure Backup to access the Key Vault. Specify the permissions in PowerShell as described in the **Enable backup** section in the [Azure Backup PowerShell](backup-azure-vms-automation.md) documentation.
4545

4646
### I migrated VM disks to managed disks. Will my backups continue to work?
4747

@@ -57,13 +57,13 @@ Yes. Backups run when a machine is shut down. The recovery point is marked as cr
5757

5858
### Can I cancel an in-progress backup job?
5959

60-
Yes. You can cancel backup job in a **Taking snapshot** state. You can't cancel a job if data transfer from the snapshot is in progress.
60+
Yes. You can cancel the backup job in a **Taking snapshot** state. You can't cancel a job if data transfer from the snapshot is in progress.
6161

62-
### I enabled lock on resource group created by Azure Backup Service (i.e `AzureBackupRG_<geo>_<number>`), will my backups continue to work?
62+
### I enabled a lock on the resource group created by Azure Backup Service (for example, `AzureBackupRG_<geo>_<number>`). Will my backups continue to work?
6363

64-
If you lock the resource group created by Azure Backup Service, backups will start to fail as there's a maximum limit of 18 restore points.
64+
If you lock the resource group created by the Azure Backup Service, backups will start to fail as there's a maximum limit of 18 restore points.
6565

66-
User needs to remove the lock and clear the restore point collection from that resource group in order to make the future backups successful, [follow these steps](backup-azure-troubleshoot-vm-backup-fails-snapshot-timeout.md#clean-up-restore-point-collection-from-azure-portal) to remove the restore point collection.
66+
Remove the lock, and clear the restore point collection from that resource group to make the future backups successful. [Follow these steps](backup-azure-troubleshoot-vm-backup-fails-snapshot-timeout.md#clean-up-restore-point-collection-from-azure-portal) to remove the restore point collection.
6767

6868
### Does Azure backup support standard SSD-managed disks?
6969

@@ -77,21 +77,25 @@ Snapshots can't be taken on the WA-enabled disk. However, the Azure Backup servi
7777

7878
Azure Backup can't back up the WA-enabled disk but can exclude it from backup. However, the backup won't provide database consistency because information on the WA-enabled disk isn't backed up. You can back up disks with this configuration if you want operating system disk backup, and backup of disks that aren't WA-enabled.
7979

80-
We're running private preview for an SAP HANA backup with an RPO of 15 minutes. It's built in a similar way to SQL DB backup, and uses the backInt interface for third-party solutions certified by SAP HANA. If you're interested, email us at `[email protected]` with the subject **Sign up for private preview for backup of SAP HANA in Azure VMs**.
80+
Azure Backup provides a streaming backup solution for SAP HANA databases with an RPO of 15 minutes. It's Backint certified by SAP to provide a native backup support leveraging SAP HANA’s native APIs. Learn more [about backing up SAP HANA databases in Azure VMs](https://docs.microsoft.com/azure/backup/sap-hana-db-about).
8181

8282
### What is the maximum delay I can expect in backup start time from the scheduled backup time I have set in my VM backup policy?
8383

84-
The scheduled backup will be triggered within 2 hours of the scheduled backup time. For example, If 100 VMs have their backup start time scheduled at 2:00 AM, then by maximum 4:00 AM all the 100 VMs will have backup job in progress. If scheduled backups have been paused due to outage and resumed/retried, then backup can start outside of this scheduled two-hour window.
84+
The scheduled backup will be triggered within 2 hours of the scheduled backup time. For example, If 100 VMs have their backup start time scheduled at 2:00 AM, then by 4:00 AM at the latest all the 100 VMs will have their backup job in progress. If scheduled backups have been paused because of an outage and resumed or retried, then the backup can start outside of this scheduled two-hour window.
8585

86-
### What is the minimum allowed retention range for daily backup point?
86+
### What is the minimum allowed retention range for a daily backup point?
8787

88-
Azure Virtual Machine backup policy supports a minimum retention range of seven days up to 9999 days. Any modification to an existing VM backup policy with less than seven days will require an update to meet the minimum retention range of seven days.
88+
Azure Virtual Machine backup policy supports a minimum retention range from seven days up to 9999 days. Any modification to an existing VM backup policy with less than seven days will require an update to meet the minimum retention range of seven days.
8989

90-
### Can I backup or restore selective disks attached to a VM?
90+
### What happens if I change the case of the name of my VM or my VM resource group?
91+
92+
If you change the case (to upper or lower) of your VM or VM resource group, the case of the backup item name won't change. However, this is expected Azure Backup behavior. The case change won't appear in the backup item, but is updated at the backend.
93+
94+
### Can I back up or restore selective disks attached to a VM?
9195

9296
Azure Backup now supports selective disk backup and restore using the Azure Virtual Machine backup solution.
9397

94-
Today, Azure Backup supports backing up all the disks (Operating System and data) in a VM together using the Virtual Machine backup solution. With exclude-disk functionality, you get an option to backup one or a few from the many data disks in a VM. This provides an efficient and cost-effective solution for your backup and restore needs. Each recovery point contains data of the disks included in the backup operation, which further allows you to have a subset of disks restored from the given recovery point during the restore operation. This applies to restore both from the snapshot and the vault.
98+
Today, Azure Backup supports backing up all the disks (operating system and data) in a VM together using the Virtual Machine backup solution. With exclude-disk functionality, you get an option to back up one or a few from the many data disks in a VM. This provides an efficient and cost-effective solution for your backup and restore needs. Each recovery point contains data of the disks included in the backup operation, which further allows you to have a subset of disks restored from the given recovery point during the restore operation. This applies to restore both from the snapshot and the vault.
9599

96100
To sign up for the preview, write to us at [email protected]
97101

@@ -115,31 +119,31 @@ Yes, you can use backups taken before disks were migrated from unmanaged to mana
115119

116120
### How do I restore a VM to a restore point before the VM was migrated to managed disks?
117121

118-
The restore process remains the same. If the recovery point is of a point-in-time when VM had unmanaged disks, you can [restore disks as unmanaged](tutorial-restore-disk.md#unmanaged-disks-restore). If the VM had managed disks then, you can [restore disks as managed disks](tutorial-restore-disk.md#managed-disk-restore). Then you can [create a VM from those disks](tutorial-restore-disk.md#create-a-vm-from-the-restored-disk).
122+
The restore process remains the same. If the recovery point is of a point-in-time when VM had unmanaged disks, you can [restore disks as unmanaged](tutorial-restore-disk.md#unmanaged-disks-restore). If the VM had managed disks, then you can [restore disks as managed disks](tutorial-restore-disk.md#managed-disk-restore). Then you can [create a VM from those disks](tutorial-restore-disk.md#create-a-vm-from-the-restored-disk).
119123

120124
[Learn more](backup-azure-vms-automation.md#restore-an-azure-vm) about doing this in PowerShell.
121125

122126
### Can I restore the VM that's been deleted?
123127

124-
Yes. Even if you delete the VM, you can go to corresponding backup item in the vault and restore from a recovery point.
128+
Yes. Even if you delete the VM, you can go to the corresponding backup item in the vault and restore from a recovery point.
125129

126-
### How to restore a VM to the same availability sets?
130+
### How do I restore a VM to the same availability sets?
127131

128-
For Managed Disk Azure VM, restoring to the availability sets is enabled by providing an option in template while restoring as managed Disks. This template has the input parameter called **Availability sets**.
132+
For Managed Disk Azure VMs, restoring to the availability sets is enabled by providing an option in the template while restoring as managed disks. This template has the input parameter called **Availability sets**.
129133

130134
### How do we get faster restore performances?
131135

132-
[Instant Restore](backup-instant-restore-capability.md) capability helps in faster backups and instant restores from the snapshots.
136+
[Instant Restore](backup-instant-restore-capability.md) capability helps with faster backups and instant restores from the snapshots.
133137

134138
### What happens when we change the key vault settings for the encrypted VM?
135139

136-
After you change the KeyVault settings for the encrypted VM, backups will continue to work with the new set of details. However, after the restore from a recovery point prior to the change, you will have to restore the secrets in a KeyVault before you can create the VM from it. For more information, refer this [article](https://docs.microsoft.com/azure/backup/backup-azure-restore-key-secret)
140+
After you change the key vault settings for the encrypted VM, backups will continue to work with the new set of details. However, after the restore from a recovery point before the change, you'll have to restore the secrets in a key vault before you can create the VM from it. For more information, see this [article](https://docs.microsoft.com/azure/backup/backup-azure-restore-key-secret).
137141

138-
Operations like secret/key roll-over do not require this step and the same KeyVault can be used after restore.
142+
Operations like secret/key roll-over don't require this step and the same KeyVault can be used after restore.
139143

140144
### Can I access the VM once restored due to a VM having broken relationship with domain controller?
141145

142-
Yes, you access the VM once restored due to a VM having broken relationship with domain controller. For more information, refer this [article](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#post-restore-steps)
146+
Yes, you access the VM once restored due to a VM having broken relationship with domain controller. For more information, see this [article](https://docs.microsoft.com/azure/backup/backup-azure-arm-restore-vms#post-restore-steps)
143147

144148
## Manage VM backups
145149

@@ -154,10 +158,10 @@ The VM is backed up using the schedule and retention settings in the modified or
154158

155159
1. Temporarily stop the backup, and retain backup data.
156160
2. Move the VM to the target resource group.
157-
3. Re-enabled backup in the same or new vault.
161+
3. Re-enable backup in the same or new vault.
158162

159163
You can restore the VM from available restore points that were created before the move operation.
160164

161-
### Is there a limit on number of VMs that can be associated with a same backup policy?
165+
### Is there a limit on number of VMs that can be associated with the same backup policy?
162166

163-
Yes, there is a limit of 100 VMs that can be associated to the same backup policy from portal. We recommend that for more than 100 VMs, create multiple backup policies with same schedule or different schedule.
167+
Yes, there's a limit of 100 VMs that can be associated to the same backup policy from the portal. We recommend that for more than 100 VMs, create multiple backup policies with same schedule or different schedule.

articles/virtual-machines/linux/disk-encryption.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Server-side encryption of Azure Managed Disks - Azure CLI
33
description: Azure Storage protects your data by encrypting it at rest before persisting it to Storage clusters. You can rely on Microsoft-managed keys for the encryption of your managed disks, or you can use customer-managed keys to manage encryption with your own keys.
44
author: roygara
55

6-
ms.date: 04/02/2020
6+
ms.date: 04/21/2020
77
ms.topic: conceptual
88
ms.author: rogarana
99
ms.service: virtual-machines-linux
@@ -68,7 +68,7 @@ For now, customer-managed keys have the following restrictions:
6868

6969
- If this feature is enabled for your disk, you cannot disable it.
7070
If you need to work around this, you must [copy all the data](disks-upload-vhd-to-managed-disk-cli.md#copy-a-managed-disk) to an entirely different managed disk that isn't using customer-managed keys.
71-
- Only ["soft" and "hard" RSA keys](../../key-vault/about-keys-secrets-and-certificates.md#keys-and-key-types) of size 2048 are supported, no other keys or sizes.
71+
- Only ["soft" and "hard" RSA keys](../../key-vault/keys/about-keys.md) of size 2048 are supported, no other keys or sizes.
7272
- Disks created from custom images that are encrypted using server-side encryption and customer-managed keys must be encrypted using the same customer-managed keys and must be in the same subscription.
7373
- Snapshots created from disks that are encrypted with server-side encryption and customer-managed keys must be encrypted with the same customer-managed keys.
7474
- Custom images encrypted using server-side encryption and customer-managed keys cannot be used in the shared image gallery.

articles/virtual-machines/linux/openshift-azure-stack.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
---
22
title: Deploy OpenShift in Azure Stack
33
description: Deploy OpenShift in Azure Stack.
4-
services: virtual-machines-linux
5-
documentationcenter: virtual-machines
64
author: haroldwongms
75
manager: joraio
8-
editor:
9-
tags: azure-resource-manager
10-
11-
ms.assetid:
126
ms.service: virtual-machines-linux
13-
7+
ms.subservice: workloads
148
ms.topic: article
15-
ms.tgt_pltfrm: vm-linux
169
ms.workload: infrastructure
1710
ms.date: 10/14/2019
1811
ms.author: haroldw

articles/virtual-machines/linux/openshift-container-platform-3x-marketplace-self-managed.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
---
22
title: Deploy OpenShift Container Platform 3.11 Self-Managed Marketplace Offer in Azure
33
description: Deploy OpenShift Container Platform 3.11 Self-Managed Marketplace Offer in Azure.
4-
services: virtual-machines-linux
5-
documentationcenter: virtual-machines
64
author: haroldwongms
75
manager: mdotson
8-
editor:
9-
tags: azure-resource-manager
10-
11-
ms.assetid:
126
ms.service: virtual-machines-linux
13-
7+
ms.subservice: workloads
148
ms.topic: article
159
ms.tgt_pltfrm: vm-linux
1610
ms.workload: infrastructure

articles/virtual-machines/linux/openshift-container-platform-3x-post-deployment.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
---
22
title: OpenShift Container Platform 3.11 in Azure post-deployment tasks
33
description: Additional tasks for after an OpenShift Container Platform 3.11 cluster has been deployed.
4-
services: virtual-machines-linux
5-
documentationcenter: virtual-machines
64
author: haroldwongms
75
manager: mdotson
8-
editor:
9-
tags: azure-resource-manager
10-
11-
ms.assetid:
126
ms.service: virtual-machines-linux
13-
7+
ms.subservice: workloads
148
ms.topic: article
15-
ms.tgt_pltfrm: vm-linux
169
ms.workload: infrastructure
1710
ms.date: 10/14/2019
1811
ms.author: haroldw

articles/virtual-machines/linux/openshift-container-platform-3x-prerequisites.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
---
22
title: OpenShift Container Platform 3.11 in Azure prerequisites
33
description: Prerequisites to deploy OpenShift Container Platform 3.11 in Azure.
4-
services: virtual-machines-linux
5-
documentationcenter: virtual-machines
64
author: haroldwongms
75
manager: mdotson
8-
editor:
9-
tags: azure-resource-manager
10-
11-
ms.assetid:
126
ms.service: virtual-machines-linux
13-
7+
ms.subservice: workloads
148
ms.topic: article
15-
ms.tgt_pltfrm: vm-linux
169
ms.workload: infrastructure
1710
ms.date: 10/23/2019
1811
ms.author: haroldw

articles/virtual-machines/linux/openshift-container-platform-3x-troubleshooting.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
---
22
title: Troubleshoot OpenShift Container Platform 3.11 deployment in Azure
33
description: Troubleshoot OpenShift Container Platform 3.11 deployment in Azure.
4-
services: virtual-machines-linux
5-
documentationcenter: virtual-machines
64
author: haroldwongms
75
manager: mdotson
8-
editor:
9-
tags: azure-resource-manager
10-
11-
ms.assetid:
126
ms.service: virtual-machines-linux
13-
7+
ms.subservice: workloads
148
ms.topic: article
159
ms.tgt_pltfrm: vm-linux
1610
ms.workload: infrastructure

articles/virtual-machines/linux/openshift-container-platform-3x.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
---
22
title: Deploy OpenShift Container Platform 3.11 in Azure
33
description: Deploy OpenShift Container Platform 3.11 in Azure.
4-
services: virtual-machines-linux
5-
documentationcenter: virtual-machines
64
author: haroldwongms
75
manager: mdotson
8-
editor:
9-
tags: azure-resource-manager
10-
11-
ms.assetid:
126
ms.service: virtual-machines-linux
13-
7+
ms.subservice: workloads
148
ms.topic: article
15-
ms.tgt_pltfrm: vm-linux
169
ms.workload: infrastructure
1710
ms.date: 04/05/2020
1811
ms.author: haroldw

articles/virtual-machines/linux/openshift-container-platform-4x.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
---
22
title: Deploy OpenShift Container Platform 4.x in Azure
33
description: Deploy OpenShift Container Platform 4.x in Azure.
4-
services: virtual-machines-linux
5-
documentationcenter: virtual-machines
64
author: haroldwongms
75
manager: mdotson
8-
editor:
9-
tags: azure-resource-manager
10-
11-
ms.assetid:
126
ms.service: virtual-machines-linux
13-
7+
ms.subservice: workloads
148
ms.topic: article
15-
ms.tgt_pltfrm: vm-linux
169
ms.workload: infrastructure
1710
ms.date: 10/14/2019
1811
ms.author: haroldw

articles/virtual-machines/linux/openshift-get-started.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
---
22
title: OpenShift in Azure overview
33
description: An overview of OpenShift in Azure.
4-
services: virtual-machines-linux
5-
documentationcenter: virtual-machines
64
author: haroldwongms
75
manager: mdotson
8-
editor:
9-
tags: azure-resource-manager
10-
11-
ms.assetid:
126
ms.service: virtual-machines-linux
13-
7+
ms.subservice: workloads
148
ms.topic: article
15-
ms.tgt_pltfrm: vm-linux
169
ms.workload: infrastructure
1710
ms.date: 05/7/2019
1811
ms.author: haroldw

0 commit comments

Comments
 (0)