From c36bd12f723472fd5e2be7c834430ce06ed275af Mon Sep 17 00:00:00 2001 From: Seif Bassem <38246040+sebassem@users.noreply.github.com> Date: Wed, 14 Aug 2024 00:40:17 +0300 Subject: [PATCH 1/5] update vhd --- azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 b/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 index 1116cbc..05af616 100644 --- a/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 +++ b/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 @@ -16,7 +16,7 @@ $changeTrackingDCR = $env:changeTrackingDCR $vmInsightsDCR = $env:vmInsightsDCR # Moved VHD storage account details here to keep only in place to prevent duplicates. -$vhdSourceFolder = "https://jumpstartprodsg.blob.core.windows.net/arcbox/*" +$vhdSourceFolder = "https://jumpstartprodsg.blob.core.windows.net/arcbox/prod/*" $vhdSourceFolderESU = "https://jumpstartprodsg.blob.core.windows.net/scenarios/prod/*" # Archive exising log file and crate new one From fadcaa8473a071a073061ab5ec36641fe0d38bf5 Mon Sep 17 00:00:00 2001 From: Basim Majeed Date: Tue, 20 Aug 2024 12:35:11 +0100 Subject: [PATCH 2/5] Deploy to deploy --- azure_arc_servers_jumpstart/ARM/azuredeploy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_arc_servers_jumpstart/ARM/azuredeploy.json b/azure_arc_servers_jumpstart/ARM/azuredeploy.json index 770f813..1177a2b 100644 --- a/azure_arc_servers_jumpstart/ARM/azuredeploy.json +++ b/azure_arc_servers_jumpstart/ARM/azuredeploy.json @@ -863,7 +863,7 @@ "type": "Microsoft.SecurityInsights/onboardingStates", "apiVersion": "2024-03-01", "scope": "[format('Microsoft.OperationalInsights/workspaces/{0}', parameters('workspaceName'))]", - "name": "Default", + "name": "default", "properties": {}, "dependsOn": [ "[resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaceName'))]" From 4dbfb7df9dcc6230e781e0c1298a33e8aa040449 Mon Sep 17 00:00:00 2001 From: Basim Majeed Date: Tue, 20 Aug 2024 13:56:43 +0100 Subject: [PATCH 3/5] hard coded password changed --- .../artifacts/ArcServersLogonScript.ps1 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 b/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 index 05af616..2b9d68a 100644 --- a/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 +++ b/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 @@ -98,11 +98,7 @@ if ($inernalSwitch.Name -ne $switchName) { Write-Host "Creating demo VM Credentials" # Hard-coded username and password for the nested demo VMs $nestedWindowsUsername = "Administrator" -$nestedWindowsPassword = "ArcDemo123!!" - -# Hard-coded username and password for the nested demo 2012 VM -$nestedWindows2k12Username = "Administrator" -$nestedWindows2k12Password = "JS123!!" +$nestedWindowsPassword = "JS123!!" # Create Windows credential object $secWindowsPassword = ConvertTo-SecureString $nestedWindowsPassword -AsPlainText -Force @@ -110,7 +106,7 @@ $winCreds = New-Object System.Management.Automation.PSCredential ($nestedWindows # Create Windows credential object for 2012 $secWindows2k12Password = ConvertTo-SecureString $nestedWindows2k12Password -AsPlainText -Force -$win2k12Creds = New-Object System.Management.Automation.PSCredential ($nestedWindows2k12Username, $secWindows2k12Password) +$win2k12Creds = New-Object System.Management.Automation.PSCredential ($nestedWindowsUsername, $secWindowsPassword) # Creating Hyper-V Manager desktop shortcut Write-Host "Creating Hyper-V Shortcut" @@ -275,7 +271,7 @@ Set-Content -Path $file -Value $hostfile -Force Write-Host "Creating demo VM Credentials" # Hard-coded username and password for the nested demo VMs $nestedLinuxUsername = "arcdemo" -$nestedLinuxPassword = "ArcDemo123!!" +$nestedLinuxPassword = "JS123!!" # Create Linux credential object $secLinuxPassword = ConvertTo-SecureString $nestedLinuxPassword -AsPlainText -Force From 6dca229437e8c133d8becadeef84e7497b4315ad Mon Sep 17 00:00:00 2001 From: Basim Majeed Date: Tue, 20 Aug 2024 14:30:06 +0100 Subject: [PATCH 4/5] win2012 credentials removed --- .../artifacts/ArcServersLogonScript.ps1 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 b/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 index 2b9d68a..7a4d924 100644 --- a/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 +++ b/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 @@ -104,10 +104,6 @@ $nestedWindowsPassword = "JS123!!" $secWindowsPassword = ConvertTo-SecureString $nestedWindowsPassword -AsPlainText -Force $winCreds = New-Object System.Management.Automation.PSCredential ($nestedWindowsUsername, $secWindowsPassword) -# Create Windows credential object for 2012 -$secWindows2k12Password = ConvertTo-SecureString $nestedWindows2k12Password -AsPlainText -Force -$win2k12Creds = New-Object System.Management.Automation.PSCredential ($nestedWindowsUsername, $secWindowsPassword) - # Creating Hyper-V Manager desktop shortcut Write-Host "Creating Hyper-V Shortcut" Copy-Item -Path "C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Hyper-V Manager.lnk" -Destination "C:\Users\All Users\Desktop" -Force @@ -282,7 +278,7 @@ Write-Host "Restarting Network Adapters" Start-Sleep -Seconds 30 Invoke-Command -VMName $Win2k19vmName -ScriptBlock { Get-NetAdapter | Restart-NetAdapter } -Credential $winCreds Invoke-Command -VMName $Win2k22vmName -ScriptBlock { Get-NetAdapter | Restart-NetAdapter } -Credential $winCreds -$session = New-PSSession -ComputerName $Win2k12vmName -Credential $win2k12Creds +$session = New-PSSession -ComputerName $Win2k12vmName -Credential $winCreds Invoke-Command -session $session -Script {Get-NetAdapter | Restart-NetAdapter} -AsJob | Receive-Job -Wait Exit-PSSession if($deploySQL -eq $true){ @@ -291,7 +287,7 @@ if($deploySQL -eq $true){ Start-Sleep -Seconds 10 # Renaming 2012 machine -Invoke-Command -ComputerName $Win2k12vmName -ScriptBlock { Rename-Computer -NewName $using:Win2k12MachineName -Restart} -Credential $win2k12Creds +Invoke-Command -ComputerName $Win2k12vmName -ScriptBlock { Rename-Computer -NewName $using:Win2k12MachineName -Restart} -Credential $winCreds # Getting the Ubuntu nested VM IP address $Ubuntu01VmIp = Get-VM -Name $Ubuntu01vmName | Select-Object -ExpandProperty NetworkAdapters | Select-Object -ExpandProperty IPAddresses | Select-Object -Index 0 @@ -332,7 +328,7 @@ Write-Host "Onboarding Arc-enabled servers" $Ubuntu02vmvhdPath = "${Env:ArcBoxVMDir}\${Ubuntu02vmName}.vhdx" Write-Output "Onboarding the nested Windows VMs as Azure Arc-enabled servers" Invoke-Command -VMName $Win2k19vmName -ScriptBlock { powershell -File $Using:nestedVMArcBoxDir\installArcAgent.ps1 -accessToken $Using:accessToken, -spnTenantId $Using:spnTenantId, -subscriptionId $Using:subscriptionId, -resourceGroup $Using:resourceGroup, -azureLocation $Using:azureLocation } -Credential $winCreds -Invoke-Command -ComputerName $Win2k12vmName -ScriptBlock { powershell -File $Using:nestedVMArcBoxDir\installArcAgent.ps1 -accessToken $Using:accessToken, -spnTenantId $Using:spnTenantId, -subscriptionId $Using:subscriptionId, -resourceGroup $Using:resourceGroup, -azureLocation $Using:azureLocation } -Credential $win2k12Creds +Invoke-Command -ComputerName $Win2k12vmName -ScriptBlock { powershell -File $Using:nestedVMArcBoxDir\installArcAgent.ps1 -accessToken $Using:accessToken, -spnTenantId $Using:spnTenantId, -subscriptionId $Using:subscriptionId, -resourceGroup $Using:resourceGroup, -azureLocation $Using:azureLocation } -Credential $winCreds # Test Defender for Servers Write-Host "Simulating threats to generate alerts from Defender for Cloud" From 336efeecb98884f287589b10aad780fc455ee89c Mon Sep 17 00:00:00 2001 From: Basim Majeed Date: Tue, 20 Aug 2024 15:12:22 +0100 Subject: [PATCH 5/5] linux creds fixed --- azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 b/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 index 7a4d924..e17a344 100644 --- a/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 +++ b/azure_arc_servers_jumpstart/artifacts/ArcServersLogonScript.ps1 @@ -266,7 +266,7 @@ Set-Content -Path $file -Value $hostfile -Force Write-Host "Creating demo VM Credentials" # Hard-coded username and password for the nested demo VMs -$nestedLinuxUsername = "arcdemo" +$nestedLinuxUsername = "jumpstart" $nestedLinuxPassword = "JS123!!" # Create Linux credential object