Merge pull request #89202 from msmbaldwin/disk-encrypt-vms

Migrating Linux VM ADE content to virtual-machines docset

Author: v-shils

articles/azure-government/documentation-government-impact-level-5.md

@@ -167,7 +167,7 @@ Current VM SKUs that offer necessary compute isolation include specific offering
 The storage supporting these Virtual Machines can be encrypted in one of two ways to support necessary encryption standards.
 
 - Leverage Azure Disk Encryption to encrypt the drives using DM-Crypt (Linux) or BitLocker (Windows):
-  - [Enable Azure Disk Encryption for Linux](../security/azure-security-disk-encryption-linux.md)
+  - [Enable Azure Disk Encryption for Linux](../virtual-machines/linux/disk-encryption-overview.md)
   - [Enable Azure Disk Encryption for Windows](../security/azure-security-disk-encryption-windows.md)
 - Leverage Azure Storage Service Encryption for Storage Accounts with your own key to encrypt the storage account that holds the disks:
   - [Storage Service Encryption with Customer Managed Keys](../storage/common/storage-service-encryption-customer-managed-keys.md)

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

@@ -49,7 +49,7 @@ Azure Backup can back up and restore Azure VMs using ADE with and without the Az
 
 Before you start, do the following:
 
-1. Make sure you have one or more [Windows](../security/azure-security-disk-encryption-windows.md) or [Linux](../security/azure-security-disk-encryption-linux.md) VMs with ADE enabled.
+1. Make sure you have one or more [Windows](../security/azure-security-disk-encryption-windows.md) or [Linux](../virtual-machines/linux/disk-encryption-overview.md) VMs with ADE enabled.
 2. [Review the support matrix](backup-support-matrix-iaas.md) for Azure VM backup
 3. [Create](backup-azure-arm-vms-prepare.md#create-a-vault) a Recovery Services Backup vault if you don't have one.
 4. If you enable encryption for VMs that are already enabled for backup, you simply need to provide Backup with permissions to access the Key Vault so that backups can continue without disruption. [Learn more](#provide-permissions) about assigning these permissions.

articles/security-center/security-center-apply-disk-encryption.md

@@ -38,7 +38,7 @@ To encrypt Azure Virtual Machines that have been identified by Security Center a
 * Obtain and run the Azure Disk Encryption Prerequisites Azure PowerShell script.
 * Encrypt your virtual machines.
 
-[Encrypt a Windows IaaS VM with Azure PowerShell](../security/azure-disk-encryption-linux-powershell-quickstart.md) walks you through these steps. This topic assumes you are using a Windows client machine from which you configure disk encryption.
+[Encrypt a Windows IaaS VM with Azure PowerShell](../virtual-machines/linux/disk-encryption-powershell-quickstart.md) walks you through these steps. This topic assumes you are using a Windows client machine from which you configure disk encryption.
 
 There are many approaches that can be used for Azure Virtual Machines. If you are already well-versed in Azure PowerShell or Azure CLI, then you may prefer to use alternate approaches. To learn about these other approaches, see [Azure disk encryption](../security/azure-security-disk-encryption.md).
 

articles/security/azure-security-disk-encryption-appendix.md

@@ -101,7 +101,7 @@ Before you start, review the [Prerequisites](azure-security-disk-encryption-prer
      ```
 
 ### <a name="bkmk_prereq-script"></a> Using the Azure Disk Encryption prerequisites PowerShell script
-If you're already familiar with the prerequisites for Azure Disk Encryption, you can use the [Azure Disk Encryption prerequisites PowerShell script](https://raw.githubusercontent.com/Azure/azure-powershell/master/src/Compute/Compute/Extension/AzureDiskEncryption/Scripts/AzureDiskEncryptionPreRequisiteSetup.ps1 ). For an example of using this PowerShell script, see the [Encrypt a VM Quickstart](azure-disk-encryption-linux-powershell-quickstart.md). You can remove the comments from a section of the script, starting at line 211, to encrypt all disks for existing VMs in an existing resource group. 
+If you're already familiar with the prerequisites for Azure Disk Encryption, you can use the [Azure Disk Encryption prerequisites PowerShell script](https://raw.githubusercontent.com/Azure/azure-powershell/master/src/Compute/Compute/Extension/AzureDiskEncryption/Scripts/AzureDiskEncryptionPreRequisiteSetup.ps1 ). For an example of using this PowerShell script, see the [Encrypt a VM Quickstart](../virtual-machines/linux/disk-encryption-powershell-quickstart.md). You can remove the comments from a section of the script, starting at line 211, to encrypt all disks for existing VMs in an existing resource group. 
 
 The following table shows which parameters can be used in the PowerShell script: 
 

articles/security/azure-security-disk-encryption-prerequisites.md

@@ -177,7 +177,7 @@ The [Azure CLI 2.0](/cli/azure) is a command-line tool for managing Azure resour
 
 
 ## Prerequisite workflow for Key Vault
-If you're already familiar with the Key Vault and Azure AD prerequisites for Azure Disk Encryption, you can use the [Azure Disk Encryption prerequisites PowerShell script](https://raw.githubusercontent.com/Azure/azure-powershell/master/src/Compute/Compute/Extension/AzureDiskEncryption/Scripts/AzureDiskEncryptionPreRequisiteSetup.ps1 ). For more information on using the prerequisites script, see the [Encrypt a VM Quickstart](azure-disk-encryption-linux-powershell-quickstart.md) and the [Azure Disk Encryption Appendix](azure-security-disk-encryption-appendix.md#bkmk_prereq-script). 
+If you're already familiar with the Key Vault and Azure AD prerequisites for Azure Disk Encryption, you can use the [Azure Disk Encryption prerequisites PowerShell script](https://raw.githubusercontent.com/Azure/azure-powershell/master/src/Compute/Compute/Extension/AzureDiskEncryption/Scripts/AzureDiskEncryptionPreRequisiteSetup.ps1 ). For more information on using the prerequisites script, see the [Encrypt a VM Quickstart](../virtual-machines/linux/disk-encryption-powershell-quickstart.md) and the [Azure Disk Encryption Appendix](azure-security-disk-encryption-appendix.md#bkmk_prereq-script). 
 
 1. If needed, create a resource group.
 2. Create a key vault. 

articles/security/fundamentals/virtual-machines-overview.md

@@ -98,7 +98,7 @@ The solution is integrated with Azure Key Vault to help you control and manage t
 Learn more:
 
 * [Azure Disk Encryption for IaaS VMs](/azure/security/azure-security-disk-encryption-overview)
-* [Quickstart: Encrypt a Windows IaaS VM with Azure PowerShell](../azure-disk-encryption-linux-powershell-quickstart.md)
+* [Quickstart: Encrypt a Windows IaaS VM with Azure PowerShell](../../virtual-machines/linux/disk-encryption-powershell-quickstart.md)
 
 ## Virtual machine backup
 

articles/security/toc.yml

@@ -8,9 +8,9 @@
   - name: Quickstarts
     items:
     - name: Encrypt a Linux VM with Azure CLI
-      href: azure-disk-encryption-linux-cli-quickstart.md
+      href: ../virtual-machines/linux/disk-encryption-cli-quickstart.md
     - name: Encrypt a Linux VM with Azure PowerShell
-      href: azure-disk-encryption-linux-powershell-quickstart.md
+      href: ../virtual-machines/linux/disk-encryption-powershell-quickstart.md
     - name: Encrypt a Windows VM with Azure CLI
       href: azure-disk-encryption-windows-cli-quickstart.md
     - name: Encrypt a Windows VM with Azure PowerShell
@@ -20,7 +20,7 @@
   - name: Disk encryption for Windows VMs
     href: azure-security-disk-encryption-windows.md
   - name: Disk encryption for Linux VMs
-    href: azure-security-disk-encryption-linux.md
+    href: ../virtual-machines/linux/disk-encryption-overview.md
   - name: Disk encryption with virtual machine scale set extension sequencing
     href: azure-security-disk-encryption-extension-sequencing.md
   - name: Appendix for disk encryption

articles/security/azure-disk-encryption-linux-cli-quickstart.md renamed to articles/virtual-machines/linux/disk-encryption-cli-quickstart.md

@@ -14,7 +14,7 @@ The Azure CLI is used to create and manage Azure resources from the command line
 
 If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
 
-[!INCLUDE [cloud-shell-try-it.md](../../includes/cloud-shell-try-it.md)]
+[!INCLUDE [cloud-shell-try-it.md](../../../includes/cloud-shell-try-it.md)]
 
 If you choose to install and use the CLI locally, this quickstart requires that you are running the Azure CLI version 2.0.30 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI]( /cli/azure/install-azure-cli).
 
@@ -23,7 +23,7 @@ If you choose to install and use the CLI locally, this quickstart requires that
 Create a resource group with the [az group create](/cli/azure/group?view=azure-cli-latest#az-group-create) command. An Azure resource group is a logical container into which Azure resources are deployed and managed. The following example creates a resource group named *myResourceGroup* in the *eastus* location:
 
 ```azurecli-interactive
-az group create --name myResourceGroup --location eastus
+az group create --name "myResourceGroup" --location "eastus"
 ```
 
 ## Create a virtual machine
@@ -32,10 +32,11 @@ Create a VM with [az vm create](https://docs.microsoft.com/cli/azure/vm?view=azu
 
 ```azurecli-interactive
 az vm create \
-    --resource-group myResourceGroup \
-    --name myVM \
-    --image Canonical:UbuntuServer:16.04-LTS:latest \
-    --size Standard_D2S_V3
+    --resource-group "myResourceGroup" \
+    --name "myVM" \
+    --image "Canonical:UbuntuServer:16.04-LTS:latest" \
+    --size "Standard_D2S_V3"\
+    --generate-ssh-keys
 ```
 
 It takes a few minutes to create the VM and supporting resources. The following example output shows the VM create operation was successful.
@@ -58,24 +59,24 @@ It takes a few minutes to create the VM and supporting resources. The following
 Azure disk encryption stores its encryption key in an Azure Key Vault. Create a Key Vault with [az keyvault create](/cli/azure/keyvault?view=azure-cli-latest#az-keyvault-create). To enable the Key Vault to store encryption keys, use the --enabled-for-disk-encryption parameter.
 
 > [!Important]
-> Each Key Vault must have a unique name. The following example creates a Key Vault named *myKV*, but you must name yours something different.
+> Every key vault must have a name that is unique across Azure. In the examples below, replace <your-unique-keyvault-name> with the  name you choose.
 
-```azurecli
-az keyvault create --name "myKV" --resource-group "myResourceGroup" --location eastus --enabled-for-disk-encryption
+```azurecli-interactive
+az keyvault create --name "<your-unique-keyvault-name>" --resource-group "myResourceGroup" --location "eastus" --enabled-for-disk-encryption
 ```
 
 ## Encrypt the virtual machine
 
 Encrypt your VM with [az vm encryption](/cli/azure/vm/encryption?view=azure-cli-latest), providing your unique Key Vault name to the --disk-encryption-keyvault parameter.
 
 ```azurecli-interactive
-az vm encryption enable -g MyResourceGroup --name MyVM --disk-encryption-keyvault myKV
+az vm encryption enable -g "MyResourceGroup" --name "myVM" --disk-encryption-keyvault "<your-unique-keyvault-name>"
 ```
 
 After a moment the process will return, "The encryption request was accepted. Please use 'show' command to monitor the progress.". The "show" command is [az vm show](/cli/azure/vm/encryption#az-vm-encryption-show).
 
 ```azurecli-interactive
-az vm show --name MyVM -g MyResourceGroup
+az vm show --name "myVM" -g "MyResourceGroup"
 ```
 
 When encryption is enabled, you will see the following in the returned output:
@@ -89,12 +90,12 @@ When encryption is enabled, you will see the following in the returned output:
 When no longer needed, you can use the [az group delete](/cli/azure/group) command to remove the resource group, VM, and Key Vault. 
 
 ```azurecli-interactive
-az group delete --name myResourceGroup
+az group delete --name "myResourceGroup"
 ```
 
 ## Next steps
 
-In this quickstart, you created a virtual machine, created a Key Vault that was enable for encryption keys, and encrypted the VM.  Advance to the next article to learn more about Azure Disk Encryption prerequisites for IaaS VMs.
+In this quickstart, you created a virtual machine, created a Key Vault that was enable for encryption keys, and encrypted the VM.  Advance to the next article to learn more about more Azure Disk Encryption for Linux VMs.
 
 > [!div class="nextstepaction"]
-> [Azure Disk Encryption prerequisites](azure-security-disk-encryption-prerequisites.md)
+> [Azure Disk Encryption overview](disk-encryption-overview.md)