From 7f3683d013498e0fbeb392f94cfa1277060ec894 Mon Sep 17 00:00:00 2001
From: Lord Hepipud <contact@lordhepipud.de>
Date: Wed, 30 Oct 2019 17:50:07 +0100
Subject: [PATCH] Fixes variable naming and perf data output

---
 lib/plugins/Invoke-IcingaCheckDirectory.psm1  | 13 +++++-----
 .../directory/Icinga_Provider_Directory.psm1  | 26 +++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/lib/plugins/Invoke-IcingaCheckDirectory.psm1 b/lib/plugins/Invoke-IcingaCheckDirectory.psm1
index c20ecba..4223eea 100644
--- a/lib/plugins/Invoke-IcingaCheckDirectory.psm1
+++ b/lib/plugins/Invoke-IcingaCheckDirectory.psm1
@@ -64,15 +64,16 @@ function Invoke-IcingaCheckDirectory()
       [switch]$Recurse,
       $Critical           = $null,
       $Warning            = $null,
-      [string]$YoungerThen,
-      [string]$OlderThen,
+      [string]$YoungerThan,
+      [string]$OlderThan,
       [ValidateSet(0, 1, 2, 3)]
-      [int]$Verbosity     = 0
+      [int]$Verbosity     = 0,
+      [switch]$NoPerfData
    );
 
    $DirectoryData  = Get-IcingaDirectoryAll -Path $Path -FileNames $FileNames `
-                     -Recurse $Recurse -YoungerThen $YoungerThen -OlderThen $OlderThen;
-   $DirectoryCheck = New-IcingaCheck -Name $Path -Value $DirectoryData.Count -NoPerfData;
+                     -Recurse $Recurse -YoungerThan $YoungerThan -OlderThan $OlderThan;
+   $DirectoryCheck = New-IcingaCheck -Name 'File Count' -Value $DirectoryData.Count;
 
    $DirectoryCheck.WarnOutOfRange(
       ($Warning)
@@ -82,5 +83,5 @@ function Invoke-IcingaCheckDirectory()
 
    $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);
 }
\ No newline at end of file
diff --git a/lib/provider/directory/Icinga_Provider_Directory.psm1 b/lib/provider/directory/Icinga_Provider_Directory.psm1
index e4d187c..b9994ca 100644
--- a/lib/provider/directory/Icinga_Provider_Directory.psm1
+++ b/lib/provider/directory/Icinga_Provider_Directory.psm1
@@ -6,8 +6,8 @@ function Get-IcingaDirectoryAll()
         [string]$Path,
         [array]$FileNames,
         [bool]$Recurse,
-        [string]$YoungerThen,
-        [string]$OlderThen
+        [string]$YoungerThan,
+        [string]$OlderThan
     );
 
     if ($Recurse -eq $TRUE) {
@@ -16,17 +16,17 @@ function Get-IcingaDirectoryAll()
         $DirectoryData = Get-ChildItem -Path $Path -Include $FileNames;
     }
     
-    if ([string]::IsNullOrEmpty($OlderThen) -eq $FALSE -And [string]::IsNullOrEmpty($YoungerThen) -eq $FALSE) {
-      $OlderThen = Set-NumericNegative (ConvertTo-Seconds $OlderThen);
-      $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -lt (Get-Date).AddSeconds($OlderThen)})
-      $YoungerThen = Set-NumericNegative (ConvertTo-Seconds $YoungerThen);
-      $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -gt (Get-Date).AddSeconds($YoungerThen)})
-    } elseif ([string]::IsNullOrEmpty($OlderThen) -eq $FALSE) {
-      $OlderThen = Set-NumericNegative (ConvertTo-Seconds $OlderThen);
-      $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -lt (Get-Date).AddSeconds($OlderThen)})
-    } elseif ([string]::IsNullOrEmpty($YoungerThen) -eq $FALSE) {
-      $YoungerThen = Set-NumericNegative (ConvertTo-Seconds $YoungerThen);
-      $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -gt ((Get-Date).AddSeconds($YoungerThen))})
+    if ([string]::IsNullOrEmpty($OlderThan) -eq $FALSE -And [string]::IsNullOrEmpty($YoungerThan) -eq $FALSE) {
+      $OlderThan = Set-NumericNegative (ConvertTo-Seconds $OlderThan);
+      $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -lt (Get-Date).AddSeconds($OlderThan)})
+      $YoungerThan = Set-NumericNegative (ConvertTo-Seconds $YoungerThan);
+      $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -gt (Get-Date).AddSeconds($YoungerThan)})
+    } elseif ([string]::IsNullOrEmpty($OlderThan) -eq $FALSE) {
+      $OlderThan = Set-NumericNegative (ConvertTo-Seconds $OlderThan);
+      $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -lt (Get-Date).AddSeconds($OlderThan)})
+    } elseif ([string]::IsNullOrEmpty($YoungerThan) -eq $FALSE) {
+      $YoungerThan = Set-NumericNegative (ConvertTo-Seconds $YoungerThan);
+      $DirectoryData = ($DirectoryData | Where-Object {$_.LastWriteTime -gt ((Get-Date).AddSeconds($YoungerThan))})
     }
 
     return $DirectoryData;