Fixes memory leak in EventLog fetcher

Icinga · Nov 15, 2023 · e5ee6c2 · e5ee6c2
1 parent 36e8198
commit e5ee6c2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/lib/core/framework/Read-IcingaWindowsEventLog.psm1 b/lib/core/framework/Read-IcingaWindowsEventLog.psm1
@@ -52,6 +52,11 @@ function Read-IcingaWindowsEventLog()
             $CollectedEvents += $event;
         }
 
+        if ($null -ne $IcingaEvents) {
+            $IcingaEvents.Dispose();
+            $IcingaEvents = $null;
+        }
+
         $CollectedEvents = $CollectedEvents | Sort-Object { $_.TimeCreated };
 
         foreach ($event in $CollectedEvents) {
@@ -71,6 +76,8 @@ function Read-IcingaWindowsEventLog()
             Write-IcingaConsolePlain -Message '[{0}] {1}' -Objects $event.TimeCreated, $event.Message -ForeColor $ForeColor;
         }
 
+        $CollectedEvents = $null;
+
         Start-Sleep -Seconds 1;
         # Force Icinga for Windows Garbage Collection
         Optimize-IcingaForWindowsMemory -ClearErrorStack;

diff --git a/lib/core/tools/Show-IcingaEventLogAnalysis.psm1 b/lib/core/tools/Show-IcingaEventLogAnalysis.psm1
@@ -11,6 +11,11 @@ function Show-IcingaEventLogAnalysis()
     try {
         [array]$BasicLogArray = Get-WinEvent -ListLog $LogName -ErrorAction Stop;
         $BasicLogData         = $BasicLogArray[0];
+
+        if ($null -ne $BasicLogArray) {
+            $BasicLogArray.Dispose();
+            $BasicLogArray = $null;
+        }
     } catch {
         Write-IcingaConsoleError 'Failed to fetch data for EventLog "{0}". Probably this log does not exist.' -Objects $LogName;
         return;
@@ -81,6 +86,11 @@ function Show-IcingaEventLogAnalysis()
         $LogAnalysis.Minute.Average = [math]::Ceiling($LogAnalysis.Minute.Count / $LogAnalysis.Minute.Entries.Count);
     }
 
+    if ($null -ne $LogData) {
+        $LogData.Dispose();
+        $LogData = $null;
+    }
+
     foreach ($value in $LogAnalysis.Day.Entries.Values) {
         $LogAnalysis.Day.Maximum = Get-IcingaValue -Value $value -Compare $LogAnalysis.Day.Maximum -Maximum;
     }

diff --git a/lib/provider/assets/hyperv/Get-IcingaProviderDataValuesHyperV.psm1 b/lib/provider/assets/hyperv/Get-IcingaProviderDataValuesHyperV.psm1
@@ -102,6 +102,16 @@ function Get-IcingaProviderDataValuesHyperV()
                 }
             }
         }
+
+        if ($null -ne $InformationBlackoutTimes) {
+            $InformationBlackoutTimes.Dispose();
+            $InformationBlackoutTimes = $null;
+        }
+
+        if ($null -ne $WarningBlackoutTimes) {
+            $WarningBlackoutTimes.Dispose();
+            $WarningBlackoutTimes = $null;
+        }
     } catch {
         Exit-IcingaThrowException -ExceptionType 'Custom' -CustomMessage 'Hyper-V Error' -ExceptionThrown $_.Exception.Message -Force;
     }