Skip to content

Commit 61ee2af

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents ac7828b + 3beb067 commit 61ee2af

File tree

62 files changed

+1167
-2355
lines changed

Some content is hidden

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

62 files changed

+1167
-2355
lines changed

articles/azure-resource-manager/management/move-limitations/virtual-machines-move-limitations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The following scenarios aren't yet supported:
2424

2525
To move virtual machines configured with Azure Backup, you must delete the restore points from the vault.
2626

27-
If [soft delete](../../../backup/backup-azure-security-feature-cloud.md) is enabled for your virtual machine, you can't move the virtual machine while those restore points are kept. Either [disable soft delete](../../../backup/backup-azure-security-feature-cloud.md#disabling-soft-delete) or wait 14 days after deleting the restore points.
27+
If [soft delete](../../../backup/backup-azure-security-feature-cloud.md) is enabled for your virtual machine, you can't move the virtual machine while those restore points are kept. Either [disable soft delete](../../../backup/backup-azure-security-feature-cloud.md#enabling-and-disabling-soft-delete) or wait 14 days after deleting the restore points.
2828

2929
### Portal
3030

articles/azure-resource-manager/templates/deploy-to-azure-button.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
title: Deploy to Azure button
33
description: Use button to deploy Azure Resource Manager templates from a GitHub repository.
44
ms.topic: conceptual
5-
ms.date: 02/07/2020
5+
ms.date: 05/04/2020
66
---
77
# Use a deployment button to deploy templates from GitHub repository
88

9-
This article describes how to use the **Deploy to Azure** button to deploy templates from a GitHub repository. You can add the button directly to the README.md file in your GitHub repository or to a web page that references the repository.
9+
This article describes how to use the **Deploy to Azure** button to deploy templates from a GitHub repository. You can add the button directly to the README.md file in your GitHub repository or to a web page that references the repository. This method only supports resource group level deployment.
1010

1111
## Use common image
1212

articles/backup/azure-file-share-support-matrix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ You can use the [Azure Backup service](https://docs.microsoft.com/azure/backup/b
1313

1414
Backup for Azure file shares is available in the following GEOS:
1515

16-
| GA regions | Supported regions but not GA |
16+
| GA regions | Supported regions (as part of preview) but not yet GA |
1717
| ------------------------------------------------------------ | ------------------------------------------------------------ |
1818
| Australia South East (ASE), Canada Central (CNC), West Central US (WCUS), West US 2 (WUS 2), India South (INS), North Central US (NCUS), Japan East (JPE), Brazil South (BRS), South East Asia (SEA),Switzerland West (SZW), UAE Central (UAC), Norway East (NWE),India West (INW), Australia Central (ACL), Korea Central (KRC), Japan West (JPW), South Africa North (SAN), UK West (UKW), Korea South (KRS) |Australia East (AE), Canada East (CE), East Asia (EA), East US (EUS), East US 2 (EUS2), India Central (INC), North Europe (NE), South Central US (SCUS), UK South (UKS), West Europe (WE), West US (WUS), US Gov Arizona (UGA), US Gov Texas (UGT), US Gov Virginia (UGV), UAE North(UAN), France Central (FRC), Germany North (GN), Germany West Central (GWC), South Africa West (SAW), Norway West (NWW), Switzerland North (SZN) , Central US (CUS) |
1919

articles/backup/backup-azure-security-feature-cloud.md

Lines changed: 27 additions & 178 deletions
Large diffs are not rendered by default.

articles/backup/backup-create-rs-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ We highly recommend you review the default settings for **Storage Replication ty
116116

117117
- **Storage Replication type** by default is set to **Geo-redundant**. Once you configure the backup, the option to modify is disabled. Follow these [steps](https://docs.microsoft.com/azure/backup/backup-create-rs-vault#set-storage-redundancy) to review and modify the settings.
118118

119-
- **Soft delete** by default is **Enabled** on newly created vaults to protect backup data from accidental or malicious deletes. Follow these [steps](https://docs.microsoft.com/azure/backup/backup-azure-security-feature-cloud#disabling-soft-delete) to review and modify the settings.
119+
- **Soft delete** by default is **Enabled** on newly created vaults to protect backup data from accidental or malicious deletes. Follow these [steps](https://docs.microsoft.com/azure/backup/backup-azure-security-feature-cloud#enabling-and-disabling-soft-delete) to review and modify the settings.
120120

121121
## Next steps
122122

articles/backup/backup-encryption.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
title: Encryption in Azure Backup
3+
description: Learn about how encryption features in Azure Backup help you protect your backup data and meet the security needs of your business.
4+
ms.topic: conceptual
5+
ms.date: 04/30/2020
6+
---
7+
8+
# Encryption in Azure Backup
9+
10+
All your backed-up data is automatically encrypted when stored in the cloud using Azure Storage encryption, which helps you meet your security and compliance commitments. This data at rest is encrypted using 256-bit AES encryption, one of the strongest block ciphers available, and is FIPS 140-2 compliant.
11+
12+
In addition to encryption at rest, all your backup data in transit is transferred over HTTPS. It always remains on the Azure backbone network.
13+
14+
For more information, see [Azure Storage encryption for data at rest](https://docs.microsoft.com/azure/storage/common/storage-service-encryption). Refer to the [Azure Backup FAQ](https://docs.microsoft.com/azure/backup/backup-azure-backup-faq#encryption) to answer any questions that you may have about encryption.
15+
16+
## Encryption of backup data using platform-managed keys
17+
18+
By default, all your data is encrypted using platform-managed keys. You don't need to take any explicit action from your end to enable this encryption and it applies to all workloads being backed up to your Recovery Services vault.
19+
20+
## Encryption of backup data using customer-managed keys
21+
22+
When backing up your Azure Virtual Machines, you can now encrypt your data using keys owned and managed by you. Azure Backup lets you use your RSA keys stored in the Azure Key Vault for encrypting your backups. The encryption key used for encrypting backups may be different from the one used for the source. The data is protected using an AES 256 based data encryption key (DEK), which is, in turn, protected using your keys. This gives you full control over the data and the keys. To allow encryption, it's required that the Recovery Services vault be granted access to the encryption key in the Azure Key Vault. You can disable the key or revoke access whenever needed. However, you must enable encryption using your keys before you attempt to protect any items to the vault.
23+
24+
>[!NOTE]
25+
>This feature is currently in limited availability. Please fill out [this survey](https://forms.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR0H3_nezt2RNkpBCUTbWEapURE9TTDRIUEUyNFhNT1lZS1BNVDdZVllHWi4u) and email us at [email protected] if you wish to encrypt your backup data using customer managed keys. Note that the ability to use this feature is subject to approval from the Azure Backup service.
26+
27+
## Backup of managed disk VMs encrypted using customer-managed keys
28+
29+
Azure Backup also allows you back up your Azure VMs that use your key for server-side encryption. The key used for encrypting the disks is stored in the Azure Key Vault and managed by you. Server-side encryption using customer-managed keys differs from Azure Disk Encryption, since ADE leverages BitLocker (for Windows) and DM-Crypt (for Linux) to perform in-guest encryption, SSE encrypts data in the storage service, enabling you to use any OS or images for your VMs. Refer to [Encryption of managed disks with customer managed keys](https://docs.microsoft.com/azure/virtual-machines/windows/disk-encryption#customer-managed-keys) for more details.
30+
31+
## Backup of VMs encrypted using ADE
32+
33+
With Azure Backup, you can also back up your Azure Virtual machines that have their OS or data disks encrypted using Azure Disk Encryption. ADE uses BitLocker for Windows VMs and DM-Crypt for Linux VMs to perform in-guest encryption. For details, see [Back up and restore encrypted virtual machines with Azure Backup](https://docs.microsoft.com/azure/backup/backup-azure-vms-encryption).
34+
35+
## Next steps
36+
37+
- [Back up and restore an encrypted Azure VM](backup-azure-vms-encryption.md)

articles/backup/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ landingContent:
6363
linkLists:
6464
- linkListType: whats-new
6565
links:
66-
- text: Soft Delete for Azure VM backup data
66+
- text: Soft Delete for Azure Backup
6767
url: backup-azure-security-feature-cloud.md
6868
- text: SQL Server on Azure VMs restore as files
6969
url: restore-sql-database-azure-vm.md#restore-as-files
39.4 KB
Loading
367 KB
Loading
141 KB
Loading

0 commit comments

Comments
 (0)