wording changes

03-Azure/01-03-Infrastructure/02_Hybrid_Azure_Arc_Servers/walkthrough/challenge-6/solution.md

@@ -3,45 +3,47 @@
 Duration: 15 minutes
 
 [Previous Challenge Solution](../challenge-5/solution.md) - **[Home](../../Readme.md)**
+request with the Azure Arc agent to Azure.`
 
+> **:warning: IMPORTANT :warning:**  
+> In this challenge you will puchase an ESU license which will incur the cost displayed during the process. Please be aware that the overall cost also includes back-billing as per the rules of ESU licensing. While the montly billing will stop once the license is deactivated, the back-billing will be final.
 
 ## Task 1: Create a Windows Server ESU license
 
 1. Navigate to the Azure Arc center and click "Licenses" and "Windows Server ESU licenses" (or click [here](https://portal.azure.com/#view/Microsoft_Azure_ArcCenterUX/ArcCenterMenuBlade/~/license))
 2. Click "Create" on the top bar. A new blade will open.
 3. Fill in the required field:
-    - Subscription and Resource group (where you created your previous objects)
-    - A license name - should only contain letters (both uppercase and lowercase), digits, hyphens, underscores, and periods. Consecutive dots are not allowed.
-    - Select "Activate now" (you could create one with "Activate later" but cannot attach it to a server then)
-    - Keep "West Europe" as the selected region
-    - Select virtual cores with 8 total
-    - De-select the "Have an invoice?" checkbox at the bottom
-    - Make sure the Software Assurance box is checked, and then click "Create"
-    ![alt text](img/image1.png)
-    ![alt text](img/image2.png)
-    - Wait a couple of moments and click "Refresh" in the license overview. Your new item will apprear:
-    ![alt text](img/image3.png)
-### 
-
+   - Subscription and Resource group (where you created your previous objects)
+   - A license name - should only contain letters (both uppercase and lowercase), digits, hyphens, underscores, and periods. Consecutive dots are not allowed.
+   - Select "Activate now" (you could create one with "Activate later" but cannot attach it to a server then)
+   - Keep "West Europe" as the selected region
+   - Select virtual cores with 8 total
+   - De-select the "Have an invoice?" checkbox at the bottom
+   - Make sure the Software Assurance box is checked, and then click "Create"
+     ![alt text](img/image1.png)
+     ![alt text](img/image2.png)
+   - Wait a couple of moments and click "Refresh" in the license overview. Your new item will apprear:
+     ![alt text](img/image3.png)
 
+###
 
-## Task 2: Attach the ESU license to the server: 
+## Task 2: Attach the ESU license to the server:
 
 1. Navigate to the Azure Arc center and click "Licenses" and "Windows Server ESU licenses" (or click [here](https://portal.azure.com/#view/Microsoft_Azure_ArcCenterUX/ArcCenterMenuBlade/~/license))
 2. Click "Eligible resources" on the top to get a list of Arc enabled server that are eligible to use an ESU license
 3. Select your Windows 2012 server and click "Enable ESUs"
-![alt text](img/image4.png)
+   ![alt text](img/image4.png)
 4. Select "Virtual Cores" which will then allow you to select your previously created license
-![alt text](img/image5.png)
+   ![alt text](img/image5.png)
 5. Click "Enable" to attach the license to the server
 6. The overview, once refreshed, will now report the server es ESU enabled
 
-    ![alt text](img/image6.png)
-
-
+   ![alt text](img/image6.png)
 
 ###
+
 **Congratulations!** You successfully completed the challenge! 🚀🚀🚀
 
-### Optional Steps:  
-1. Check for Windows Updates and observe that new security rollups are being downloaded and installed
+### Optional Steps:
+
+1. Check for Windows Updates and observe that new security rollups are being downloaded and installed

03-Azure/01-03-Infrastructure/04_BCDR_Azure_Native/Infra/App1/MODULES/SITERECOVERY/asrvault.bicep

@@ -23,6 +23,11 @@ resource recoveryServicesVault 'Microsoft.RecoveryServices/vaults@2024-04-01' =
         emailNotificationsForSiteRecovery: 'Disabled'
       }
     }
+    securitySettings: {
+      immutabilitySettings: {
+        state: 'Disabled'
+      }
+    }
   }
   sku: {
     name: 'RS0'
@@ -40,7 +45,7 @@ resource backupRsvConfig 'Microsoft.RecoveryServices/vaults/BackupConfig@2022-02
     softDeleteFeatureState: 'Disabled'
     redundancySettings: {
       crossRegionRestore: 'Enabled'
-      standardTierStorageRedundancy: 'GeoRedundant'
+      standardTierStorageRedundancy: 'ZoneRedundant'
     }
   }
 }
@@ -52,7 +57,7 @@ resource backupVlt 'Microsoft.DataProtection/backupVaults@2024-04-01' = {
     storageSettings: [
       {
         datastoreType: 'VaultStore'
-        type: 'GeoRedundant'
+        type: 'ZoneRedundant'
 
       }
     ]

03-Azure/01-03-Infrastructure/04_BCDR_Azure_Native/Infra/App1/deploy.json

@@ -214,6 +214,11 @@
                   "classicAlertSettings": {
                     "alertsForCriticalOperations": "Disabled",
                     "emailNotificationsForSiteRecovery": "Disabled"
+                  },
+                  "securitySettings": {
+                    "immutabilitySettings": {
+                      "state": "Disabled"
+                    }
                   }
                 }
               },
@@ -235,7 +240,7 @@
                 "softDeleteFeatureState": "Disabled",
                 "redundancySettings": {
                   "crossRegionRestore": "Enabled",
-                  "standardTierStorageRedundancy": "GeoRedundant"
+                  "standardTierStorageRedundancy": "ZoneRedundant"
                 }
               },
               "dependsOn": [
@@ -251,7 +256,7 @@
                 "storageSettings": [
                   {
                     "datastoreType": "VaultStore",
-                    "type": "GeoRedundant"
+                    "type": "ZoneRedundant"
                   }
                 ]
               }
@@ -371,7 +376,7 @@
                 "softDeleteFeatureState": "Disabled",
                 "redundancySettings": {
                   "crossRegionRestore": "Enabled",
-                  "standardTierStorageRedundancy": "GeoRedundant"
+                  "standardTierStorageRedundancy": "ZoneRedundant"
                 }
               },
               "dependsOn": [
@@ -387,7 +392,7 @@
                 "storageSettings": [
                   {
                     "datastoreType": "VaultStore",
-                    "type": "GeoRedundant"
+                    "type": "ZoneRedundant"
                   }
                 ]
               }

03-Azure/01-03-Infrastructure/04_BCDR_Azure_Native/Infra/App1/main.parameters.json

@@ -6,7 +6,7 @@
       "value": "mh<insertParticipantNumber>-"
     },
     "sourceLocation": {
-      "value": "germanywestcentral"
+      "value": "italynorth"
     },
     "targetLocation": {
       "value": "swedencentral"
@@ -77,55 +77,55 @@
           "purpose": "web",
           "deploy": true,
           "nameSuffix": "web1",
-          "vmSize": "Standard_D2as_v5",
+          "vmSize": "Standard_D2as_v6",
           "osDiskSize": 127,
           "dataDiskSize": 0,
           "osType": "Windows",
           "imagePublisher": "MicrosoftWindowsServer",
           "imageOffer": "WindowsServer",
-          "imageSku": "2019-Datacenter",
+          "imageSku": "2019-Datacenter-gensecond",
           "imageVersion": "latest",
           "publicIp": false
         },
         {
           "purpose": "web",
           "deploy": true,
           "nameSuffix": "web2",
-          "vmSize": "Standard_D2as_v5",
+          "vmSize": "Standard_D2as_v6",
           "osDiskSize": 127,
           "dataDiskSize": 0,
           "osType": "Windows",
           "imagePublisher": "MicrosoftWindowsServer",
           "imageOffer": "WindowsServer",
-          "imageSku": "2019-Datacenter",
+          "imageSku": "2019-Datacenter-gensecond",
           "imageVersion": "latest",
           "publicIp": false
         },
         {
           "purpose": "sql",
           "deploy": true,
           "nameSuffix": "sql",
-          "vmSize": "Standard_D4as_v5",
+          "vmSize": "Standard_D4as_v6",
           "osDiskSize": 127,
           "dataDiskSize": 1024,
           "osType": "Windows",
           "imagePublisher": "MicrosoftSQLServer",
           "imageOffer": "SQL2019-WS2019",
-          "imageSku": "Standard",
+          "imageSku": "Standard-gen2",
           "imageVersion": "latest",
           "publicIp": false
         },
         {
           "purpose": "linux",
           "deploy": true,
           "nameSuffix": "linux",
-          "vmSize": "Standard_D2as_v5",
+          "vmSize": "Standard_D2as_v6",
           "osDiskSize": 127,
           "dataDiskSize": 1024,
           "osType": "Linux",
-          "imagePublisher": "Canonical",
-          "imageOffer": "UbuntuServer",
-          "imageSku": "18.04-LTS",
+          "imagePublisher": "canonical",
+          "imageOffer": "0001-com-ubuntu-server-focal",
+          "imageSku": "20_04-lts-gen2",
           "imageVersion": "latest",
           "publicIp": false
         }