tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Icinga2Agent.psm1: remove trailing whitespaces

This commit is contained in:
Thomas Gelf 2016-07-20 23:19:14 +02:00
parent 757b4d430d
commit dcecba0098
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
contrib/windows-agent-installer/Icinga2Agent.psm1
View File

@ -83,7 +83,7 @@ function Icinga2AgentModule {
$installer | Add-Member -membertype ScriptMethod -name 'getProperty' -value { $installer | Add-Member -membertype ScriptMethod -name 'getProperty' -value {
param([string] $key) param([string] $key)
# Initialse some variables first # Initialse some variables first
# will only be called once # will only be called once
if (-Not $this.properties.Get_Item('initialized')) { if (-Not $this.properties.Get_Item('initialized')) {
$this.init(); $this.init();
@ -142,10 +142,10 @@ function Icinga2AgentModule {
#Write-Host $this.error($error[$error.count - 1].FullyQualifiedErrorId) -ForegroundColor red; #Write-Host $this.error($error[$error.count - 1].FullyQualifiedErrorId) -ForegroundColor red;
Write-Host $_.Exception.Message -ForegroundColor red; Write-Host $_.Exception.Message -ForegroundColor red;
} }
# #
# this function will print an info message # this function will print an info message
# or throw an exception, based on the # or throw an exception, based on the
# provided exitcode # provided exitcode
# (0 = ok, anything else => exception) # (0 = ok, anything else => exception)
# #
@ -205,11 +205,11 @@ function Icinga2AgentModule {
# Generate endpoint nodes based on iput # Generate endpoint nodes based on iput
# parameters # parameters
$this.generateEndpointNodes(); $this.generateEndpointNodes();
} }
# #
# We require to run this script as admin. Generate the required function here # We require to run this script as admin. Generate the required function here
# We might run this script from a non-privileged user. Ensure we have admin # We might run this script from a non-privileged user. Ensure we have admin
# rights first. Otherwise abort the script. # rights first. Otherwise abort the script.
# #
$installer | Add-Member -membertype ScriptMethod -name 'isAdmin' -value { $installer | Add-Member -membertype ScriptMethod -name 'isAdmin' -value {
@ -252,7 +252,7 @@ function Icinga2AgentModule {
# Do we require to update the Agent? # Do we require to update the Agent?
# Might be disabled by user or current version # Might be disabled by user or current version
# is already installed # is already installed
# #
$installer | Add-Member -membertype ScriptMethod -name 'requireAgentUpdate' -value { $installer | Add-Member -membertype ScriptMethod -name 'requireAgentUpdate' -value {
if (-Not $this.config('allow_updates') -Or -Not $this.config('agent_version')) { if (-Not $this.config('allow_updates') -Or -Not $this.config('agent_version')) {
$this.warn('Icinga 2 Agent update installation disabled.'); $this.warn('Icinga 2 Agent update installation disabled.');
@ -352,7 +352,7 @@ function Icinga2AgentModule {
# #
# Updates the Agent in case allowed and required. # Updates the Agent in case allowed and required.
# Removes previous version of Icinga 2 Agent first # Removes previous version of Icinga 2 Agent first
# #
$installer | Add-Member -membertype ScriptMethod -name 'updateAgent' -value { $installer | Add-Member -membertype ScriptMethod -name 'updateAgent' -value {
$this.downloadInstaller(); $this.downloadInstaller();
if (-Not $this.installerExists()) { if (-Not $this.installerExists()) {
@ -370,7 +370,7 @@ function Icinga2AgentModule {
$this.info('Agent successfully updated.'); $this.info('Agent successfully updated.');
$this.setProperty('cur_install_dir', $this.getProperty('def_install_dir')); $this.setProperty('cur_install_dir', $this.getProperty('def_install_dir'));
$this.setProperty('require_restart', 'true'); $this.setProperty('require_restart', 'true');
} }
# #
# We might have installed the Icinga 2 Agent # We might have installed the Icinga 2 Agent
@ -392,12 +392,12 @@ function Icinga2AgentModule {
} }
# Try locating current Icinga 2 Agent installation # Try locating current Icinga 2 Agent installation
$localData = Get-ItemProperty $regPath | $localData = Get-ItemProperty $regPath |
.{ .{
process { process {
if ($_.DisplayName) { if ($_.DisplayName) {
$_ $_
} }
} }
} | } |
Where { Where {
@ -407,10 +407,10 @@ function Icinga2AgentModule {
if ($localData.UninstallString) { if ($localData.UninstallString) {
$this.setProperty('uninstall_id', $localData.UninstallString.Replace("MsiExec.exe ", "")); $this.setProperty('uninstall_id', $localData.UninstallString.Replace("MsiExec.exe ", ""));
} }
$this.setProperty('def_install_dir', $defaultInstallDir); $this.setProperty('def_install_dir', $defaultInstallDir);
$this.setProperty('cur_install_dir', $localData.InstallLocation); $this.setProperty('cur_install_dir', $localData.InstallLocation);
$this.setProperty('agent_version', $localData.DisplayVersion); $this.setProperty('agent_version', $localData.DisplayVersion);
$this.setProperty('install_msi_package', 'Icinga2-v' + $this.config('agent_version') + '-' + $architecture + '.msi'); $this.setProperty('install_msi_package', 'Icinga2-v' + $this.config('agent_version') + '-' + $architecture + '.msi');
if ($localData.InstallLocation) { if ($localData.InstallLocation) {
@ -469,14 +469,14 @@ function Icinga2AgentModule {
Remove-Item $this.getInstallerPath() | out-null Remove-Item $this.getInstallerPath() | out-null
} }
} }
# #
# Get Api directory if Icinga 2 # Get Api directory if Icinga 2
# #
$installer | Add-Member -membertype ScriptMethod -name 'getApiDirectory' -value { $installer | Add-Member -membertype ScriptMethod -name 'getApiDirectory' -value {
return $this.getProperty('api_dir'); return $this.getProperty('api_dir');
} }
# #
# Should we remove the Api directory content # Should we remove the Api directory content
# from the Agent? Can be defined by setting the # from the Agent? Can be defined by setting the
@ -485,16 +485,16 @@ function Icinga2AgentModule {
$installer | Add-Member -membertype ScriptMethod -name 'shouldFlushIcingaApiDirectory' -value { $installer | Add-Member -membertype ScriptMethod -name 'shouldFlushIcingaApiDirectory' -value {
return $this.config('flush_api_dir'); return $this.config('flush_api_dir');
} }
# #
# Flush all content from the Icinga 2 Agent # Flush all content from the Icinga 2 Agent
# Api directory, but keep the folder structure # Api directory, but keep the folder structure
# #
$installer | Add-Member -membertype ScriptMethod -name 'flushIcingaApiDirectory' -value { $installer | Add-Member -membertype ScriptMethod -name 'flushIcingaApiDirectory' -value {
if (Test-Path $this.getApiDirectory()) { if (Test-Path $this.getApiDirectory()) {
$this.info('Flushing content of ' + $this.getApiDirectory()); $this.info('Flushing content of ' + $this.getApiDirectory());
$folder = New-Object -ComObject Scripting.FileSystemObject; $folder = New-Object -ComObject Scripting.FileSystemObject;
$folder.DeleteFolder($this.getApiDirectory()); $folder.DeleteFolder($this.getApiDirectory());
} }
} }
@ -513,12 +513,12 @@ function Icinga2AgentModule {
} else { } else {
$this.info('Icinga 2 Agent successfully restarted.'); $this.info('Icinga 2 Agent successfully restarted.');
$this.setProperty('require_restart', ''); $this.setProperty('require_restart', '');
} }
} }
$installer | Add-Member -membertype ScriptMethod -name 'generateIcingaConfiguration' -value { $installer | Add-Member -membertype ScriptMethod -name 'generateIcingaConfiguration' -value {
if ($this.getProperty('generate_config') -eq 'true') { if ($this.getProperty('generate_config') -eq 'true') {
$this.checkConfigInputParametersAndThrowException(); $this.checkConfigInputParametersAndThrowException();
$icingaCurrentConfig = ''; $icingaCurrentConfig = '';
@ -526,7 +526,7 @@ function Icinga2AgentModule {
$icingaCurrentConfig = [System.IO.File]::ReadAllText($this.getIcingaConfigFile()); $icingaCurrentConfig = [System.IO.File]::ReadAllText($this.getIcingaConfigFile());
} }
$icingaNewConfig = $icingaNewConfig =
'/** Icinga 2 Config - proposed by Icinga Director */ '/** Icinga 2 Config - proposed by Icinga Director */
include "constants.conf" include "constants.conf"
include <itl> include <itl>
@ -592,7 +592,7 @@ object ApiListener "api" {
# Generate a SHA1 Hash from a provided string # Generate a SHA1 Hash from a provided string
# #
$installer | Add-Member -membertype ScriptMethod -name 'getHashFromString' -value { $installer | Add-Member -membertype ScriptMethod -name 'getHashFromString' -value {
param([string]$text) param([string]$text)
$algorithm = new-object System.Security.Cryptography.SHA1Managed $algorithm = new-object System.Security.Cryptography.SHA1Managed
$hash = [System.Text.Encoding]::UTF8.GetBytes($text) $hash = [System.Text.Encoding]::UTF8.GetBytes($text)
$hashInBytes = $algorithm.ComputeHash($hash) $hashInBytes = $algorithm.ComputeHash($hash)
@ -613,7 +613,7 @@ object ApiListener "api" {
# Create Icinga 2 configuration file based # Create Icinga 2 configuration file based
# on Director settings # on Director settings
# #
$installer | Add-Member -membertype ScriptMethod -name 'writeConfig' -value { $installer | Add-Member -membertype ScriptMethod -name 'writeConfig' -value {
# Write new configuration to file # Write new configuration to file
$this.info('Writing icinga2.conf to ' + $this.getProperty('config_dir')); $this.info('Writing icinga2.conf to ' + $this.getProperty('config_dir'));
[System.IO.File]::WriteAllText($this.getIcingaConfigFile(), $this.getProperty('new_icinga_config')); [System.IO.File]::WriteAllText($this.getIcingaConfigFile(), $this.getProperty('new_icinga_config'));
@ -624,7 +624,7 @@ object ApiListener "api" {
# Write old coniguration again # Write old coniguration again
# just in case we received errors # just in case we received errors
# #
$installer | Add-Member -membertype ScriptMethod -name 'rollbackConfig' -value { $installer | Add-Member -membertype ScriptMethod -name 'rollbackConfig' -value {
# Write new configuration to file # Write new configuration to file
$this.info('Rolling back previous icinga2.conf to ' + $this.getProperty('config_dir')); $this.info('Rolling back previous icinga2.conf to ' + $this.getProperty('config_dir'));
[System.IO.File]::WriteAllText($this.getIcingaConfigFile(), $this.getProperty('old_icinga_config')); [System.IO.File]::WriteAllText($this.getIcingaConfigFile(), $this.getProperty('old_icinga_config'));
@ -654,7 +654,7 @@ object ApiListener "api" {
# #
# Generate the Icinga 2 SSL certificate to ensure the communication between the # Generate the Icinga 2 SSL certificate to ensure the communication between the
# Agent and the Master can be established in first place # Agent and the Master can be established in first place
# #
$installer | Add-Member -membertype ScriptMethod -name 'generateCertificates' -value { $installer | Add-Member -membertype ScriptMethod -name 'generateCertificates' -value {
if ($this.config('agent_name') -And $this.config('ca_server') -And $this.config('ticket')) { if ($this.config('agent_name') -And $this.config('ca_server') -And $this.config('ticket')) {
@ -713,7 +713,7 @@ object ApiListener "api" {
# Is the current Agent the version # Is the current Agent the version
# we would like to install? # we would like to install?
# #
$installer | Add-Member -membertype ScriptMethod -name 'isAgentUpToDate' -value { $installer | Add-Member -membertype ScriptMethod -name 'isAgentUpToDate' -value {
if ($this.canInstallAgent() -And $this.getProperty('agent_version') -eq $this.config('agent_version')) { if ($this.canInstallAgent() -And $this.getProperty('agent_version') -eq $this.config('agent_version')) {
return $TRUE; return $TRUE;
} }
@ -760,7 +760,7 @@ object ApiListener "api" {
} }
if (-Not $this.getProperty('endpoint_nodes') -Or -Not $this.getProperty('endpoint_objects')) { if (-Not $this.getProperty('endpoint_nodes') -Or -Not $this.getProperty('endpoint_objects')) {
throw 'Argument -Endpoints <name> requires atleast one defined endpoint.'; throw 'Argument -Endpoints <name> requires atleast one defined endpoint.';
} }
} }
# #
@ -788,7 +788,7 @@ object ApiListener "api" {
$installer | Add-Member -membertype ScriptMethod -name 'madeChanges' -value { $installer | Add-Member -membertype ScriptMethod -name 'madeChanges' -value {
return $this.getProperty('require_restart'); return $this.getProperty('require_restart');
} }
# #
# Apply possible configuration changes to # Apply possible configuration changes to
# our Icinga 2 Agent # our Icinga 2 Agent
@ -825,11 +825,11 @@ object ApiListener "api" {
# including download and update if # including download and update if
# specified. Returnd 0 or 1 as exit code # specified. Returnd 0 or 1 as exit code
# #
$installer | Add-Member -membertype ScriptMethod -name 'installIcinga2Agent' -value { $installer | Add-Member -membertype ScriptMethod -name 'installIcinga2Agent' -value {
try { try {
if (-Not $this.isAdmin()) { if (-Not $this.isAdmin()) {
return 1; return 1;
} }
# Try to locate the current # Try to locate the current
# Installation data from the Agent # Installation data from the Agent
if ($this.isAgentInstalled()) { if ($this.isAgentInstalled()) {
@ -868,7 +868,7 @@ object ApiListener "api" {
} else { } else {
$this.info('No changes detected.'); $this.info('No changes detected.');
} }
return 0 return 0
} catch { } catch {
$this.printLastException(); $this.printLastException();
return 1 return 1
@ -876,4 +876,4 @@ object ApiListener "api" {
} }
return $installer return $installer
} }