upstream/icinga-powershell-framework
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-powershell-framework.git synced 2025-12-21 07:10:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed arguments to properly work on all Windows environments

Browse source
This commit is contained in:
Lord Hepipud 2019-09-13 19:16:19 +02:00
parent 2172ce2506
commit 7d5a1b786e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/icinga/exception/Exit-IcingaMissingPermission.psm1
View file

@ -4,17 +4,17 @@ Import-IcingaLib icinga\exception;
function Exit-IcingaMissingPermission() function Exit-IcingaMissingPermission()
{ {
param( param(
[string]$Input, [string]$InputString,
[string]$StringPattern, [string]$StringPattern,
[string]$CustomMessage, [string]$CustomMessage,
[string]$ExeptionType [string]$ExeptionType
); );
if ($null -eq $Input -Or [string]::IsNullOrEmpty($Input)) { if ($null -eq $InputString -Or [string]::IsNullOrEmpty($InputString)) {
return; return;
} }
if (-Not $Input.Contains($StringPattern)) { if (-Not $InputString.Contains($StringPattern)) {
return; return;
} }

2
lib/plugins/Invoke-IcingaCheckCPU.psm1
View file

@ -15,7 +15,7 @@ function Invoke-IcingaCheckCPU()
$CpuCounter = New-IcingaPerformanceCounter -Counter ([string]::Format('\Processor({0})\% processor time', $Core)); $CpuCounter = New-IcingaPerformanceCounter -Counter ([string]::Format('\Processor({0})\% processor time', $Core));
$CpuPackage = New-IcingaCheckPackage -Name 'CPU Load' -OperatorAnd -Verbos $Verbose; $CpuPackage = New-IcingaCheckPackage -Name 'CPU Load' -OperatorAnd -Verbos $Verbose;
Exit-IcingaMissingPermission -Input $CpuCounter.ErrorMessage -StringPattern '"Global"' -ExeptionType $IcingaExceptions.Throw.PerformanceCounter; Exit-IcingaMissingPermission -InputString $CpuCounter.ErrorMessage -StringPattern '"Global"' -ExeptionType $IcingaExceptions.Throw.PerformanceCounter;
if ($CpuCounter.Counters.Count -ne 0) { if ($CpuCounter.Counters.Count -ne 0) {
foreach ($counter in $CpuCounter.Counters) { foreach ($counter in $CpuCounter.Counters) {