Patch 379 (#400)

* Update ebs-encryption-enabled.md

* Update step2.png

Updated image for step 2

* Update step3.png

Updated image in step 3

* Update step4.png

Updated image in step 4

* Update step5.png

Updated image in step 5

* Update ebs-encryption-enabled.md

Updated step 5

* Update ebs-encryption-enabled.md

Updated step 6

* Update step7.png

Updated image for step 7

* Update step8.png

Updated image in step 8

* Update step9.png

Updated image in step 9

* Update step10.png

Updated image in step 10

* Update ebs-encryption-enabled.md

Updated step 10

* Update step11.png

Updated image in step 11

* Update step12.png

Updated image in step 12

* Update ebs-encryption-enabled.md

Updated step 12

* Update step13.png

Updated image in step 13

* Update ebs-encryption-enabled.md

Updated step 13

* Update step14.png

Updated image in step 14

* Update step15.png

Updated image in step 15

* Update step16.png

Updated image in step 16

* Update step17.png

Updated image in step 17

* Update step18.png

Updated image in step 18

* Update ebs-encryption-enabled.md

Updated step 18

* Update step19.png

Updated image in step 19

* Update step20.png

Updated image in step 20

* Update ebs-encryption-enabled.md

* Apply suggestions from code review

Co-authored-by: alphadev4 <[email protected]>

en/aws/ec2/ebs-encryption-enabled.md

@@ -15,24 +15,24 @@
 | **Recommended Action** | Enable encryption for EBS volumes. |
 
 ## Detailed Remediation Steps
-1. Log into the AWS Management Console.
+1. Log in to the AWS Management Console.
 2. Select the "Services" option and search for EC2. </br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step2.png"/>
 3. Scroll down the left navigation panel and choose "Volumes". </br>  <img src="/resources/aws/ec2/ebs-encryption-enabled/step3.png"/>
 4. Select the "Volume" that needs to be verified and click on its name from the "Name" column.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step4.png"/>
-5. Scroll down the page and under "Description" check for "Encrypted". If the "Encrypted" option is showing "Not Encrypted" then the selected the "EBS Volume" is not encrypted.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step5.png"/>
-6. Repeat the steps number 2 - 5 to check other "EBS Snapshot" in the AWS region.</br>
-7. Select the unencrypted "EBS Volume" that needs to be encrypted and click on the "Actions" button at the top panel and click on the "Create Snapshot" option.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step7.png"/>
+5. Scroll down the page and under "Details" check for "Encryption". If the "Encryption" option is showing "Not Encrypted" then the selected EBS Volume is not encrypted.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step5.png"/>
+6. Repeat the steps number 2 - 5 to check other EBS Volumes in the AWS region.</br>
+7. Select the unencrypted "EBS Volume" that needs to be encrypted and click on the "Actions" button, on the top panel and click on the "Create Snapshot" option.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step7.png"/>
 8. Provide the description of the new snapshot in the "Create Snapshot" dialog box and click on the "Create Snapshot" button.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step8.png"/>
 9. Scroll down the left navigation panel and choose "Snapshots".</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step9.png"/>
-10. Select the new "EBS Snapshot" created and click on the "Actions" button at the top panel and click on the "Copy" option.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step10.png"/>
-11. In the "Copy Snapshot" dialog box select the box "Encrypt this snapshot" next to "Encryption" and choose the "Master key" from the dropdown menu.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step11.png"/>
-12. Click on the "Copy" button to copy the selected "EBS Snapshot". </br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step12.png"/>
-13. Select the new EBS snapshot and click on the "Actions" button at the top panel and click on the "Create Volume" option.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step13.png"/>
+10. Select the new "EBS Snapshot" created and click on the "Actions" button, on the top panel and click on the "Copy snapshot" option.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step10.png"/>
+11. In the "Copy Snapshot" dialog box select the box "Encrypt this snapshot" next to "Encryption" and choose the "KMS key" from the dropdown menu.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step11.png"/>
+12. Click on the "Copy snapshot" button to copy the selected "EBS Snapshot". </br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step12.png"/>
+13. Select the new EBS snapshot and click on the "Actions" button at the top panel and click on the "Create Volume from snapshot" option.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step13.png"/>
 14. In the "Create Volume" dialog box verify the "Encryption" option is enabled.</br><img src="/resources/aws/ec2/ebs-encryption-enabled/step14.png"/>
 15. Click on the "Create Volume" button to create the new "EBS Encrypted Volume".</br><img src="/resources/aws/ec2/ebs-encryption-enabled/step15.png"/>
 16. Scroll down the left navigation panel and click on the "Volumes".</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step16.png"/>
 17. Select the volume that is not encrypted and click on the "Action" button at the top and click on the "Detach Volume".</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step17.png"/>
-18. In the "Detach Volume" dialog box click on the "Yes,Detach" button. </br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step18.png"/>
+18. In the "Detach Volume" dialog box click on the "Detach" button. </br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step18.png"/>
 19. Select the newly encrypted EBS volume and click on the "Action" button at the top and click on the "Attach Volume".</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step19.png"/>
 20. In the "Attach Volume" dialog box select the EC2 instance and device name for the attachment.</br> <img src="/resources/aws/ec2/ebs-encryption-enabled/step20.png"/>
 21. Repeat steps number 7 - 20 to ensure "EBS Volume" encryption is enabled.</br>