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

Fixes variable naming and perf data output

Browse source
This commit is contained in:
Lord Hepipud 2019-10-30 17:50:07 +01:00
parent 2e7c91e6ca
commit 7f3683d013
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/plugins/Invoke-IcingaCheckDirectory.psm1
View file

@ -64,15 +64,16 @@ function Invoke-IcingaCheckDirectory()
[switch]$Recurse, [switch]$Recurse,
$Critical = $null, $Critical = $null,
$Warning = $null, $Warning = $null,
[string]$YoungerThen, [string]$YoungerThan,
[string]$OlderThen, [string]$OlderThan,
[ValidateSet(0, 1, 2, 3)] [ValidateSet(0, 1, 2, 3)]
[int]$Verbosity = 0 [int]$Verbosity = 0,
[switch]$NoPerfData
); );
$DirectoryData = Get-IcingaDirectoryAll -Path $Path -FileNames $FileNames ` $DirectoryData = Get-IcingaDirectoryAll -Path $Path -FileNames $FileNames `
-Recurse $Recurse -YoungerThen $YoungerThen -OlderThen $OlderThen; -Recurse $Recurse -YoungerThan $YoungerThan -OlderThan $OlderThan;
$DirectoryCheck = New-IcingaCheck -Name $Path -Value $DirectoryData.Count -NoPerfData; $DirectoryCheck = New-IcingaCheck -Name 'File Count' -Value $DirectoryData.Count;
$DirectoryCheck.WarnOutOfRange( $DirectoryCheck.WarnOutOfRange(
($Warning) ($Warning)
@ -82,5 +83,5 @@ function Invoke-IcingaCheckDirectory()
$DirectoryPackage = New-IcingaCheckPackage -Name $Path -OperatorAnd -Checks $DirectoryCheck -Verbose $Verbosity; $DirectoryPackage = New-IcingaCheckPackage -Name $Path -OperatorAnd -Checks $DirectoryCheck -Verbose $Verbosity;
return (New-IcingaCheckresult -Check $DirectoryPackage -NoPerfData $TRUE -Compile); return (New-IcingaCheckresult -Check $DirectoryPackage -NoPerfData $NoPerfData -Compile);
} }

26
lib/provider/directory/Icinga_Provider_Directory.psm1
View file

@ -6,8 +6,8 @@ function Get-IcingaDirectoryAll()
[string]$Path, [string]$Path,
[array]$FileNames, [array]$FileNames,
[bool]$Recurse, [bool]$Recurse,
[string]$YoungerThen, [string]$YoungerThan,
[string]$OlderThen [string]$OlderThan
); );
if ($Recurse -eq $TRUE) { if ($Recurse -eq $TRUE) {
@ -16,17 +16,17 @@ function Get-IcingaDirectoryAll()
$DirectoryData = Get-ChildItem -Path $Path -Include $FileNames; $DirectoryData = Get-ChildItem -Path $Path -Include $FileNames;
} }
if ([string]::IsNullOrEmpty($OlderThen) -eq $FALSE -And [string]::IsNullOrEmpty($YoungerThen) -eq $FALSE) { if ([string]::IsNullOrEmpty($OlderThan) -eq $FALSE -And [string]::IsNullOrEmpty($YoungerThan) -eq $FALSE) {
$OlderThen = Set-NumericNegative (ConvertTo-Seconds $OlderThen); $OlderThan = Set-NumericNegative (ConvertTo-Seconds $OlderThan);
$DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -lt (Get-Date).AddSeconds($OlderThen)}) $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -lt (Get-Date).AddSeconds($OlderThan)})
$YoungerThen = Set-NumericNegative (ConvertTo-Seconds $YoungerThen); $YoungerThan = Set-NumericNegative (ConvertTo-Seconds $YoungerThan);
$DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -gt (Get-Date).AddSeconds($YoungerThen)}) $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -gt (Get-Date).AddSeconds($YoungerThan)})
} elseif ([string]::IsNullOrEmpty($OlderThen) -eq $FALSE) { } elseif ([string]::IsNullOrEmpty($OlderThan) -eq $FALSE) {
$OlderThen = Set-NumericNegative (ConvertTo-Seconds $OlderThen); $OlderThan = Set-NumericNegative (ConvertTo-Seconds $OlderThan);
$DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -lt (Get-Date).AddSeconds($OlderThen)}) $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -lt (Get-Date).AddSeconds($OlderThan)})
} elseif ([string]::IsNullOrEmpty($YoungerThen) -eq $FALSE) { } elseif ([string]::IsNullOrEmpty($YoungerThan) -eq $FALSE) {
$YoungerThen = Set-NumericNegative (ConvertTo-Seconds $YoungerThen); $YoungerThan = Set-NumericNegative (ConvertTo-Seconds $YoungerThan);
$DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -gt ((Get-Date).AddSeconds($YoungerThen))}) $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -gt ((Get-Date).AddSeconds($YoungerThan))})
} }
return $DirectoryData; return $DirectoryData;