Skip to content

Commit afb6569

Browse files
authored
Merge pull request #200933 from msmbaldwin/ade-misc
Removing ADE routing page
2 parents c350d0b + 409933d commit afb6569

35 files changed

+207
-275
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
"redirect_url": "/previous-versions/azure/germany/germany-get-started-connect-with-ps",
3131
"redirect_document_id": false
3232
},
33+
{
34+
"source_path": "articles/security/fundamentals/azure-disk-encryption-vms-vmss.md",
35+
"redirect_url": "/azure/virtual-machines/disk-encryption-overview",
36+
"redirect_document_id": false
37+
},
3338
{
3439
"source_path": "articles/germany/germany-get-started-connect-with-vs.md",
3540
"redirect_url": "/previous-versions/azure/germany/germany-get-started-connect-with-vs",

articles/azure-government/azure-secure-isolation-guidance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ Storage accounts are encrypted regardless of their performance tier (standard or
745745
Because data encryption is performed by the Storage service, server-side encryption with CMK enables you to use any operating system types and images for your VMs. For your Windows and Linux IaaS VMs, Azure also provides Azure Disk encryption that enables you to encrypt managed disks with CMK within the Guest VM, as described in the next section. Combining Azure Storage service encryption and Disk encryption effectively enables [double encryption of data at rest](../virtual-machines/disks-enable-double-encryption-at-rest-portal.md).
746746

747747
#### Azure Disk encryption
748-
Azure Storage service encryption encrypts the page blobs that store Azure Virtual Machine disks. Moreover, you may optionally use [Azure Disk encryption](../security/fundamentals/azure-disk-encryption-vms-vmss.md) to encrypt Azure [Windows](../virtual-machines/windows/disk-encryption-overview.md) and [Linux](../virtual-machines/linux/disk-encryption-overview.md) IaaS Virtual Machine disks to increase storage isolation and assure cryptographic certainty of your data stored in Azure. This encryption includes [managed disks](../virtual-machines/managed-disks-overview.md), as described later in this section. Azure disk encryption uses the industry standard [BitLocker](/windows/security/information-protection/bitlocker/bitlocker-overview) feature of Windows and the [DM-Crypt](https://en.wikipedia.org/wiki/Dm-crypt) feature of Linux to provide OS-based volume encryption that is integrated with Azure Key Vault.
748+
Azure Storage service encryption encrypts the page blobs that store Azure Virtual Machine disks. Moreover, you may optionally use [Azure Disk encryption](../virtual-machines/disk-encryption-overview.md) to encrypt Azure [Windows](../virtual-machines/windows/disk-encryption-overview.md) and [Linux](../virtual-machines/linux/disk-encryption-overview.md) IaaS Virtual Machine disks to increase storage isolation and assure cryptographic certainty of your data stored in Azure. This encryption includes [managed disks](../virtual-machines/managed-disks-overview.md), as described later in this section. Azure disk encryption uses the industry standard [BitLocker](/windows/security/information-protection/bitlocker/bitlocker-overview) feature of Windows and the [DM-Crypt](https://en.wikipedia.org/wiki/Dm-crypt) feature of Linux to provide OS-based volume encryption that is integrated with Azure Key Vault.
749749

750750
Drive encryption through BitLocker and DM-Crypt is a data protection feature that integrates with the operating system and addresses the threats of data theft or exposure from lost, stolen, or inappropriately decommissioned computers. BitLocker and DM-Crypt provide the most protection when used with a Trusted Platform Module (TPM) version 1.2 or higher. The TPM is a microcontroller designed to secure hardware through integrated cryptographic keys – it's commonly pre-installed on newer computers. BitLocker and DM-Crypt can use this technology to protect the keys used to encrypt disk volumes and provide integrity to computer boot process.
751751

@@ -774,7 +774,7 @@ For [Windows VMs](../virtual-machines/windows/disk-encryption-faq.yml), Azure Di
774774
Customer-managed keys (CMK) enable you to have [full control](../virtual-machines/disk-encryption.md#full-control-of-your-keys) over your encryption keys. You can grant access to managed disks in your Azure Key Vault so that your keys can be used for encrypting and decrypting the DEK. You can also disable your keys or revoke access to managed disks at any time. Finally, you have full audit control over key usage with Azure Key Vault monitoring to ensure that only managed disks or other authorized resources are accessing your encryption keys.
775775

776776
##### *Encryption at host*
777-
Encryption at host ensures that data stored on the VM host is encrypted at rest and flows encrypted to the Storage service. Disks with encryption at host enabled aren't encrypted with Azure Storage encryption; instead, the server hosting your VM provides the encryption for your data, and that encrypted data flows into Azure Storage. For more information, see [Encryption at host - End-to-end encryption for your VM data](../virtual-machines/disk-encryption.md#encryption-at-host---end-to-end-encryption-for-your-vm-data). As mentioned previously, [Azure Disk encryption](../security/fundamentals/azure-disk-encryption-vms-vmss.md) for virtual machines and virtual machine scale sets isn't supported by Managed HSM. However, encryption at host with CMK is supported by Managed HSM.
777+
Encryption at host ensures that data stored on the VM host is encrypted at rest and flows encrypted to the Storage service. Disks with encryption at host enabled aren't encrypted with Azure Storage encryption; instead, the server hosting your VM provides the encryption for your data, and that encrypted data flows into Azure Storage. For more information, see [Encryption at host - End-to-end encryption for your VM data](../virtual-machines/disk-encryption.md#encryption-at-host---end-to-end-encryption-for-your-vm-data). As mentioned previously, [Azure Disk encryption](../virtual-machines/disk-encryption-overview.md) for virtual machines and virtual machine scale sets isn't supported by Managed HSM. However, encryption at host with CMK is supported by Managed HSM.
778778

779779
You're [always in control of your customer data](https://www.microsoft.com/trust-center/privacy/data-management) in Azure. You can access, extract, and delete your customer data stored in Azure at will. When you terminate your Azure subscription, Microsoft takes the necessary steps to ensure that you continue to own your customer data. A common concern upon data deletion or subscription termination is whether another customer or Azure administrator can access your deleted data. The following sections explain how data deletion, retention, and destruction work in Azure.
780780

articles/backup/azure-backup-glossary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Refer to [Azure Resource Manager documentation](../azure-resource-manager/manage
7575

7676
## Azure Disk Encryption (ADE)
7777

78-
Refer to [Azure Disk Encryption documentation](../security/fundamentals/azure-disk-encryption-vms-vmss.md).
78+
Refer to [Azure Disk Encryption documentation](../virtual-machines/disk-encryption-overview.md).
7979

8080
## Backend storage / Cloud storage / Backup storage
8181

articles/backup/backup-azure-vms-encryption.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ Azure Backup can back up and restore Azure VMs using ADE with and without the Az
3636
**Unmanaged** | Yes | Yes
3737
**Managed** | Yes | Yes
3838

39-
- Learn more about [ADE](../security/fundamentals/azure-disk-encryption-vms-vmss.md), [Key Vault](../key-vault/general/overview.md), and [KEKs](../virtual-machine-scale-sets/disk-encryption-key-vault.md#set-up-a-key-encryption-key-kek).
40-
- Read the [FAQ](../security/fundamentals/azure-disk-encryption-vms-vmss.md) for Azure VM disk encryption.
39+
- Learn more about [ADE](../virtual-machines/disk-encryption-overview.md), [Key Vault](../key-vault/general/overview.md), and [KEKs](../virtual-machine-scale-sets/disk-encryption-key-vault.md#set-up-a-key-encryption-key-kek).
40+
- Read the [FAQ](../virtual-machines/disk-encryption-overview.md) for Azure VM disk encryption.
4141

4242
### Limitations
4343

articles/backup/encryption-at-rest-with-cmk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This article discusses about how to:
3030

3131
- This feature currently **doesn't support backup using MARS agent**, and you may not be able to use a CMK-encrypted vault for the same. The MARS agent uses a user passphrase-based encryption. This feature also doesn't support backup of classic VMs.
3232

33-
- This feature isn't related to [Azure Disk Encryption](../security/fundamentals/azure-disk-encryption-vms-vmss.md), which uses guest-based encryption of a VM's disk using BitLocker (for Windows) and DM-Crypt (for Linux).
33+
- This feature isn't related to [Azure Disk Encryption](../virtual-machines/disk-encryption-overview.md), which uses guest-based encryption of a VM's disk using BitLocker (for Windows) and DM-Crypt (for Linux).
3434

3535
- The Recovery Services vault can be encrypted only with keys stored in Azure Key Vault, located in the **same region**. Also, keys must be **RSA keys** only and should be in **enabled** state.
3636

articles/batch/disk-encryption.md

Lines changed: 107 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,107 @@
1-
---
2-
title: Create a pool with disk encryption enabled
3-
description: Learn how to use disk encryption configuration to encrypt nodes with a platform-managed key.
4-
ms.topic: how-to
5-
ms.date: 04/16/2021
6-
ms.devlang: csharp
7-
ms.custom: devx-track-azurecli
8-
---
9-
10-
# Create a pool with disk encryption enabled
11-
12-
When you create an Azure Batch pool using [Virtual Machine Configuration](nodes-and-pools.md#virtual-machine-configuration), you can encrypt compute nodes in the pool with a platform-managed key by specifying the disk encryption configuration.
13-
14-
This article explains how to create a Batch pool with disk encryption enabled.
15-
16-
## Why use a pool with disk encryption configuration?
17-
18-
With a Batch pool, you can access and store data on the OS and temporary disks of the compute node. Encrypting the server-side disk with a platform-managed key will safeguard this data with low overhead and convenience.
19-
20-
Batch will apply one of these disk encryption technologies on compute nodes, based on pool configuration and regional supportability.
21-
22-
- [Managed disk encryption at rest with platform-managed keys](../virtual-machines/disk-encryption.md#platform-managed-keys)
23-
- [Encryption at host using a platform-managed Key](../virtual-machines/disk-encryption.md#encryption-at-host---end-to-end-encryption-for-your-vm-data)
24-
- [Azure Disk Encryption](../security/fundamentals/azure-disk-encryption-vms-vmss.md)
25-
26-
You won't be able to specify which encryption method will be applied to the nodes in your pool. Instead, you provide the target disks you want to encrypt on their nodes, and Batch can choose the appropriate encryption method, ensuring the specified disks are encrypted on the compute node.
27-
28-
> [!IMPORTANT]
29-
> If you are creating your pool with a Linux [custom image](batch-sig-images.md), you can only enable disk encryption only if your pool is using an [Encryption At Host Supported VM size](../virtual-machines/disk-encryption.md#supported-vm-sizes).
30-
> Encryption At Host is not currently supported on User Subscription Pools until the feature becomes [publicly available in Azure](../virtual-machines/disks-enable-host-based-encryption-portal.md#prerequisites).
31-
32-
## Azure portal
33-
34-
When creating a Batch pool in the the Azure portal, select either **TemporaryDisk** or **OsAndTemporaryDisk** under **Disk Encryption Configuration**.
35-
36-
:::image type="content" source="media/disk-encryption/portal-view.png" alt-text="Screenshot of the Disk Encryption Configuration option in the Azure portal.":::
37-
38-
After the pool is created, you can see the disk encryption configuration targets in the pool's **Properties** section.
39-
40-
:::image type="content" source="media/disk-encryption/configuration-target.png" alt-text="Screenshot showing the disk encryption configuration targets in the Azure portal.":::
41-
42-
## Examples
43-
44-
The following examples show how to encrypt the OS and temporary disks on a Batch pool using the Batch .NET SDK, the Batch REST API, and the Azure CLI.
45-
46-
### Batch .NET SDK
47-
48-
```csharp
49-
pool.VirtualMachineConfiguration.DiskEncryptionConfiguration = new DiskEncryptionConfiguration(
50-
targets: new List<DiskEncryptionTarget> { DiskEncryptionTarget.OsDisk, DiskEncryptionTarget.TemporaryDisk }
51-
);
52-
```
53-
54-
### Batch REST API
55-
56-
REST API URL:
57-
58-
```
59-
POST {batchURL}/pools?api-version=2020-03-01.11.0
60-
client-request-id: 00000000-0000-0000-0000-000000000000
61-
```
62-
63-
Request body:
64-
65-
```
66-
"pool": {
67-
"id": "pool2",
68-
"vmSize": "standard_a1",
69-
"virtualMachineConfiguration": {
70-
"imageReference": {
71-
"publisher": "Canonical",
72-
"offer": "UbuntuServer",
73-
"sku": "18.04-LTS"
74-
},
75-
"diskEncryptionConfiguration": {
76-
"targets": [
77-
"OsDisk",
78-
"TemporaryDisk"
79-
]
80-
}
81-
"nodeAgentSKUId": "batch.node.ubuntu 18.04"
82-
},
83-
"resizeTimeout": "PT15M",
84-
"targetDedicatedNodes": 5,
85-
"targetLowPriorityNodes": 0,
86-
"taskSlotsPerNode": 3,
87-
"enableAutoScale": false,
88-
"enableInterNodeCommunication": false
89-
}
90-
```
91-
92-
### Azure CLI
93-
94-
```azurecli-interactive
95-
az batch pool create \
96-
--id diskencryptionPool \
97-
--vm-size Standard_DS1_V2 \
98-
--target-dedicated-nodes 2 \
99-
--image canonical:ubuntuserver:18.04-LTS \
100-
--node-agent-sku-id "batch.node.ubuntu 18.04" \
101-
--disk-encryption-targets OsDisk TemporaryDisk
102-
```
103-
104-
## Next steps
105-
106-
- Learn more about [server-side encryption of Azure Disk Storage](../virtual-machines/disk-encryption.md).
107-
- For an in-depth overview of Batch, see [Batch service workflow and resources](batch-service-workflow-features.md).
1+
---
2+
title: Create a pool with disk encryption enabled
3+
description: Learn how to use disk encryption configuration to encrypt nodes with a platform-managed key.
4+
ms.topic: how-to
5+
ms.date: 04/16/2021
6+
ms.devlang: csharp
7+
ms.custom: devx-track-azurecli
8+
---
9+
10+
# Create a pool with disk encryption enabled
11+
12+
When you create an Azure Batch pool using [Virtual Machine Configuration](nodes-and-pools.md#virtual-machine-configuration), you can encrypt compute nodes in the pool with a platform-managed key by specifying the disk encryption configuration.
13+
14+
This article explains how to create a Batch pool with disk encryption enabled.
15+
16+
## Why use a pool with disk encryption configuration?
17+
18+
With a Batch pool, you can access and store data on the OS and temporary disks of the compute node. Encrypting the server-side disk with a platform-managed key will safeguard this data with low overhead and convenience.
19+
20+
Batch will apply one of these disk encryption technologies on compute nodes, based on pool configuration and regional supportability.
21+
22+
- [Managed disk encryption at rest with platform-managed keys](../virtual-machines/disk-encryption.md#platform-managed-keys)
23+
- [Encryption at host using a platform-managed Key](../virtual-machines/disk-encryption.md#encryption-at-host---end-to-end-encryption-for-your-vm-data)
24+
- [Azure Disk Encryption](../virtual-machines/disk-encryption-overview.md)
25+
26+
You won't be able to specify which encryption method will be applied to the nodes in your pool. Instead, you provide the target disks you want to encrypt on their nodes, and Batch can choose the appropriate encryption method, ensuring the specified disks are encrypted on the compute node.
27+
28+
> [!IMPORTANT]
29+
> If you are creating your pool with a Linux [custom image](batch-sig-images.md), you can only enable disk encryption only if your pool is using an [Encryption At Host Supported VM size](../virtual-machines/disk-encryption.md#supported-vm-sizes).
30+
> Encryption At Host is not currently supported on User Subscription Pools until the feature becomes [publicly available in Azure](../virtual-machines/disks-enable-host-based-encryption-portal.md#prerequisites).
31+
32+
## Azure portal
33+
34+
When creating a Batch pool in the the Azure portal, select either **TemporaryDisk** or **OsAndTemporaryDisk** under **Disk Encryption Configuration**.
35+
36+
:::image type="content" source="media/disk-encryption/portal-view.png" alt-text="Screenshot of the Disk Encryption Configuration option in the Azure portal.":::
37+
38+
After the pool is created, you can see the disk encryption configuration targets in the pool's **Properties** section.
39+
40+
:::image type="content" source="media/disk-encryption/configuration-target.png" alt-text="Screenshot showing the disk encryption configuration targets in the Azure portal.":::
41+
42+
## Examples
43+
44+
The following examples show how to encrypt the OS and temporary disks on a Batch pool using the Batch .NET SDK, the Batch REST API, and the Azure CLI.
45+
46+
### Batch .NET SDK
47+
48+
```csharp
49+
pool.VirtualMachineConfiguration.DiskEncryptionConfiguration = new DiskEncryptionConfiguration(
50+
targets: new List<DiskEncryptionTarget> { DiskEncryptionTarget.OsDisk, DiskEncryptionTarget.TemporaryDisk }
51+
);
52+
```
53+
54+
### Batch REST API
55+
56+
REST API URL:
57+
58+
```
59+
POST {batchURL}/pools?api-version=2020-03-01.11.0
60+
client-request-id: 00000000-0000-0000-0000-000000000000
61+
```
62+
63+
Request body:
64+
65+
```
66+
"pool": {
67+
"id": "pool2",
68+
"vmSize": "standard_a1",
69+
"virtualMachineConfiguration": {
70+
"imageReference": {
71+
"publisher": "Canonical",
72+
"offer": "UbuntuServer",
73+
"sku": "18.04-LTS"
74+
},
75+
"diskEncryptionConfiguration": {
76+
"targets": [
77+
"OsDisk",
78+
"TemporaryDisk"
79+
]
80+
}
81+
"nodeAgentSKUId": "batch.node.ubuntu 18.04"
82+
},
83+
"resizeTimeout": "PT15M",
84+
"targetDedicatedNodes": 5,
85+
"targetLowPriorityNodes": 0,
86+
"taskSlotsPerNode": 3,
87+
"enableAutoScale": false,
88+
"enableInterNodeCommunication": false
89+
}
90+
```
91+
92+
### Azure CLI
93+
94+
```azurecli-interactive
95+
az batch pool create \
96+
--id diskencryptionPool \
97+
--vm-size Standard_DS1_V2 \
98+
--target-dedicated-nodes 2 \
99+
--image canonical:ubuntuserver:18.04-LTS \
100+
--node-agent-sku-id "batch.node.ubuntu 18.04" \
101+
--disk-encryption-targets OsDisk TemporaryDisk
102+
```
103+
104+
## Next steps
105+
106+
- Learn more about [server-side encryption of Azure Disk Storage](../virtual-machines/disk-encryption.md).
107+
- For an in-depth overview of Batch, see [Batch service workflow and resources](batch-service-workflow-features.md).

articles/confidential-computing/confidential-vm-faq-amd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ sections:
9595
Do I have to use the full-disk encryption scheme? Can I use a standard scheme instead?
9696
answer: |
9797
The optional full-disk encryption scheme is Azure's most secure and meets the [Confidential Computing principles](https://azure.microsoft.com/blog/azure-confidential-computing/).
98-
However, you can also use other [disk encryption schemes](../security/fundamentals/azure-disk-encryption-vms-vmss.md) along with or instead of full-disk encryption.
98+
However, you can also use other [disk encryption schemes](../virtual-machines/disk-encryption-overview.md) along with or instead of full-disk encryption.
9999
If you use multiple disk encryption schemes, double encryption might negatively affect performance.
100100
101101
- question: |

0 commit comments

Comments
 (0)