Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #51 and #54. ads Az module check as proposed by @rcarboneras #55

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fixes #51 and #54. ads Az module check as proposed by @rcarboneras #55

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd7dcc0
fixes #54
peppekerstens Jul 30, 2019
bf4e883
Proper PS command, no aliases
peppekerstens Jul 30, 2019
adb9f7b
Proper PS command, no aliases
peppekerstens Jul 30, 2019
c4bbed6
fixes #51 (already fixed without reference)
peppekerstens Jul 30, 2019
f58ad2b
Merge branch 'master' of https://github.com/peppekerstens/runbooks
peppekerstens Jul 30, 2019
08ef514
#49 added Az check by rcarboneras
peppekerstens Jul 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 29 additions & 11 deletions Utility/ARM/New-OnPremiseHybridWorker.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#PSScriptInfo

.VERSION 1.6
.VERSION 1.7

.GUID b6ad1d8e-263a-46d6-882b-71592d6e166d

Expand All @@ -26,6 +26,12 @@

.RELEASENOTES

1.7 - 7/30/2019
-- MODIFIED BY Peppe Kerstens
-- #54 Fixed source assumption.
-- removed aliases, proper PS commands
-- #49 added Az check as implemented by rcarboneras to overcome merge conflicts

1.6 - 11/15/2018
-- MODIFIED BY Alexander Zabielski
-- Updated the parameters to accept a TenantID to pass to the connection params.
Expand Down Expand Up @@ -136,9 +142,9 @@

AUTHOR: Jenny Hunter, Azure Automation Team

LASTEDIT: May 29, 2018
LASTEDIT: July 30 2019

EDITBY: Jenny Hunter
EDITBY: Peppe Kerstens

#>

Expand Down Expand Up @@ -184,13 +190,16 @@ $ErrorActionPreference = "Stop"
Write-Output "Importing necessary modules..."

# Create a list of the modules necessary to register a hybrid worker
$AzureRmModule = @{"Name" = "AzureRM"; "Version" = ""}
$AzureRmModule = @{"Name" = "AzureRM"; "Version" = ""; "Repository" = "PSGallery"}
$Modules = @($AzureRmModule)

# Import modules
foreach ($Module in $Modules) {

$ModuleName = $Module.Name
$splatRepository = @{}
If ($Module.Repository) {$splatRepository.Repository = $Module.Repository}


# Find the module version
if ([string]::IsNullOrEmpty($Module.Version)){
Expand All @@ -205,13 +214,22 @@ foreach ($Module in $Modules) {
}

# Check if the required module is already installed
$CurrentModule = Get-Module -Name $ModuleName -ListAvailable | where "Version" -eq $ModuleVersion
$CurrentModule = Get-Module -Name $ModuleName -ListAvailable | Where-Object "Version" -eq $ModuleVersion

if (!$CurrentModule) {

$null = Install-Module -Name $ModuleName -RequiredVersion $ModuleVersion -Force
$null = Install-Module -Name $ModuleName -RequiredVersion $ModuleVersion @splatRepository -Force
Write-Output " Successfully installed version $ModuleVersion of $ModuleName..."

} else {
if (($ModuleName -eq "AzureRm") -and (Get-InstalledModule -Name Az)) {
Write-Output "$ModuleName was not found but Az module is installed instead. Enabling ARM Aliases.."
Enable-AzureRmAlias
} else {

$null = Install-Module -Name $ModuleName -RequiredVersion $ModuleVersion -Force
Write-Output " Successfully installed version $ModuleVersion of $ModuleName..."
}
} else {
Write-Output " Required version $ModuleVersion of $ModuleName is installed..."
}
Expand Down Expand Up @@ -245,7 +263,7 @@ $Account = Add-AzureRmAccount @paramsplat
# Set the active subscription
$null = Set-AzureRmContext -SubscriptionID $SubscriptionID

# Check that the resource groups are valid
# Check that the resource groups are valid
$null = Get-AzureRmResourceGroup -Name $AAResourceGroupName
if ($OMSResourceGroupName) {
$null = Get-AzureRmResourceGroup -Name $OMSResourceGroupName
Expand Down Expand Up @@ -342,7 +360,7 @@ try {
$null = Unblock-File $Destination

# Change directory to location of the downloaded MMA
cd $env:temp
Set-Location -Path $env:temp

# Install the MMA
$Command = "/C:setup.exe /qn ADD_OPINSIGHTS_WORKSPACE=1 OPINSIGHTS_WORKSPACE_ID=$WorkspaceID" + " OPINSIGHTS_WORKSPACE_KEY=$WorkspaceKey " + " AcceptEndUserLicenseAgreement=1"
Expand All @@ -361,9 +379,9 @@ do {
# Check for the MMA folders
try {
# Change the directory to the location of the hybrid registration module
cd "$env:ProgramFiles\Microsoft Monitoring Agent\Agent\AzureAutomation"
$version = (ls | Sort-Object LastWriteTime -Descending | Select -First 1).Name
cd "$version\HybridRegistration"
Set-Location -Path "$env:ProgramFiles\Microsoft Monitoring Agent\Agent\AzureAutomation"
$version = (Get-ChildItem | Sort-Object LastWriteTime -Descending | Select-Item -First 1).Name
Set-Location -Path "$version\HybridRegistration"

# Import the module
Import-Module (Resolve-Path('HybridRegistration.psd1'))
Expand Down