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

Fixed include message filtering on EventLog

Browse source
This commit is contained in:
Lord Hepipud 2019-09-19 11:40:58 +02:00
parent e4f3de9321
commit 4c3c867839
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/provider/eventlog/Get-IcingaEventLog.psm1
View file

@ -46,9 +46,6 @@ function Get-IcingaEventLog()
if ($null -ne $IncludeEntryType) { if ($null -ne $IncludeEntryType) {
$EventLogArguments.Add('EntryType', $IncludeEntryType); $EventLogArguments.Add('EntryType', $IncludeEntryType);
} }
if ($null -ne $IncludeMessage) {
$EventLogArguments.Add('Message', $IncludeMessage);
}
if ($null -ne $After) { if ($null -ne $After) {
$EventLogArguments.Add('After', $After); $EventLogArguments.Add('After', $After);
} }
@ -64,21 +61,21 @@ function Get-IcingaEventLog()
Exit-IcingaThrowException -InputString $_.Exception -ExceptionType 'Unhandled' -Force; Exit-IcingaThrowException -InputString $_.Exception -ExceptionType 'Unhandled' -Force;
} }
if ($null -ne $ExcludeEventId -Or $null -ne $ExcludeUsername -Or $null -ne $ExcludeEntryType -Or $null -ne $ExcludeMessage) { if ($null -ne $ExcludeEventId -Or $null -ne $ExcludeUsername -Or $null -ne $ExcludeEntryType -Or $null -ne $ExcludeMessage -Or $null -ne $IncludeMessage) {
$filteredEvents = @(); $filteredEvents = @();
foreach ($event in $events) { foreach ($event in $events) {
# Filter out excluded event IDs # Filter out excluded event IDs
if ($event.InstanceID -contains $ExcludeEventId) { if ($ExcludeEventId.Count -ne 0 -And $event.InstanceID -contains $ExcludeEventId) {
continue; continue;
} }
# Filter out excluded event IDs # Filter out excluded event IDs
if ($event.UserName -contains $ExcludeUsername) { if ($ExcludeUsername.Count -ne 0 -And $event.UserName -contains $ExcludeUsername) {
continue; continue;
} }
# Filter out excluded event IDs # Filter out excluded event IDs
if ($event.EntryType -contains $ExcludeEntryType) { if ($ExcludeEntryType.Count -ne 0 -And $event.EntryType -contains $ExcludeEntryType) {
continue; continue;
} }
@ -95,6 +92,20 @@ function Get-IcingaEventLog()
continue; continue;
} }
[bool]$skip = $TRUE;
foreach ($inMessage in $IncludeMessage) {
# Filter for specific message content
if ([string]$event.Message -like [string]$inMessage) {
$skip = $FALSE;
break;
}
}
if ($skip) {
continue;
}
$filteredEvents += $event; $filteredEvents += $event;
} }