Skip to content

Commit bfa40af

Browse files
authored
Merge pull request #111587 from msmbaldwin/ade
Deleted unused article
2 parents 9febaa6 + 332c2fd commit bfa40af

File tree

5 files changed

+8
-149
lines changed

5 files changed

+8
-149
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,11 @@
236236
"redirect_url": "/azure//virtual-machines/windows/sql/virtual-machines-windows-portal-sql-create-failover-cluster-premium-file-share",
237237
"redirect_document_id": false
238238
},
239+
{
240+
"source_path": "articles/virtual-machines/windows/encrypt-disks.md",
241+
"redirect_url": "/azure//virtual-machines/windows/disk-encryption-overview",
242+
"redirect_document_id": false
243+
},
239244
{
240245
"source_path": "articles/virtual-machines/linux/cli-manage-nodejs.md",
241246
"redirect_url": "/azure/virtual-machines/linux/create-cli-complete",

articles/machine-learning/data-science-virtual-machine/dsvm-enterprise-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ This series provides guidance and pointers for each of the preceding topics. It
3939
* [Role-based access control](https://docs.microsoft.com/azure/role-based-access-control/overview)
4040
* [Policy setting and enforcement](../../governance/policy/overview.md)
4141
* [Antimalware](https://docs.microsoft.com/azure/security/fundamentals/antimalware)
42-
* [Encryption](https://docs.microsoft.com/azure/virtual-machines/windows/encrypt-disks)
42+
* [Encryption](https://docs.microsoft.com/azure/virtual-machines/windows/disk-encryption-overview.md)
4343
* [Data discovery and governance](https://docs.microsoft.com/azure/data-catalog/)
4444

4545
Finally, the [Azure Architecture Center](https://docs.microsoft.com/azure/architecture/) provides a detailed end-to-end architecture and models for building and managing your cloud-based analytics infrastructure.

articles/virtual-machines/windows/encrypt-disks.md

Lines changed: 0 additions & 146 deletions
This file was deleted.

articles/virtual-machines/windows/virtual-machines-windows-security-controls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ This article documents the security controls built into Windows Virtual Machines
4646

4747
| Security control | Yes/No | Notes |
4848
|---|---|--|
49-
| Server-side encryption at rest: Microsoft-managed keys | Yes | See [Encrypt virtual disks on a Windows VM](/azure/virtual-machines/windows/encrypt-disks). |
49+
| Server-side encryption at rest: Microsoft-managed keys | Yes | See [Encrypt virtual disks on a Windows VM](/azure/virtual-machines/windows/disk-encryption-overview). |
5050
| Encryption in transit (such as ExpressRoute encryption, in VNet encryption, and VNet-VNet encryption )| Yes | Azure Virtual Machines supports [ExpressRoute](/azure/expressroute) and VNet encryption. See [In-transit encryption in VMs](/azure/security/security-azure-encryption-overview#in-transit-encryption-in-vms). |
5151
| Server-side encryption at rest: customer-managed keys (BYOK) | Yes | Customer-managed keys is a supported Azure encryption scenario; see [Azure encryption overview](/azure/security/security-azure-encryption-overview#in-transit-encryption-in-vms).|
5252
| Column level encryption (Azure Data Services)| N/A | |

includes/virtual-machines-security-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To learn more about server-side encryption, refer to either the articles for [Wi
3333

3434
### Azure Disk Encryption
3535

36-
For enhanced [Windows VM](../articles/virtual-machines/windows/encrypt-disks.md) and [Linux VM](../articles/virtual-machines/linux/disk-encryption-overview.md) security and compliance, virtual disks in Azure can be encrypted. Virtual disks on Windows VMs are encrypted at rest using BitLocker. Virtual disks on Linux VMs are encrypted at rest using dm-crypt.
36+
For enhanced [Windows VM](../articles/virtual-machines/windows/disk-encryption-overview.md) and [Linux VM](../articles/virtual-machines/linux/disk-encryption-overview.md) security and compliance, virtual disks in Azure can be encrypted. Virtual disks on Windows VMs are encrypted at rest using BitLocker. Virtual disks on Linux VMs are encrypted at rest using dm-crypt.
3737

3838
There is no charge for encrypting virtual disks in Azure. Cryptographic keys are stored in Azure Key Vault using software-protection, or you can import or generate your keys in Hardware Security Modules (HSMs) certified to FIPS 140-2 level 2 standards. These cryptographic keys are used to encrypt and decrypt virtual disks attached to your VM. You retain control of these cryptographic keys and can audit their use. An Azure Active Directory service principal provides a secure mechanism for issuing these cryptographic keys as VMs are powered on and off.
3939

0 commit comments

Comments
 (0)