Adds support to read EventLog for logs

This commit is contained in:
Lord Hepipud 2021-11-04 18:47:45 +01:00
parent d759a4dd31
commit a1fdb854ec
2 changed files with 50 additions and 6 deletions

View file

@ -24,6 +24,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
### Enhancements ### Enhancements
* [#383](https://github.com/Icinga/icinga-powershell-framework/pull/383) Moves the components REST-Api [icinga-powershell-restapi](https://icinga.com/docs/icinga-for-windows/latest/restapi/doc/01-Introduction/) and API-Checks [icinga-powershell-apichecks](https://icinga.com/docs/icinga-for-windows/latest/apichecks/doc/01-Introduction/) directly into the Framework * [#383](https://github.com/Icinga/icinga-powershell-framework/pull/383) Moves the components REST-Api [icinga-powershell-restapi](https://icinga.com/docs/icinga-for-windows/latest/restapi/doc/01-Introduction/) and API-Checks [icinga-powershell-apichecks](https://icinga.com/docs/icinga-for-windows/latest/apichecks/doc/01-Introduction/) directly into the Framework
* [#392](https://github.com/Icinga/icinga-powershell-framework/pull/392) Adds support to read logs from Windows EventLog while using `Read-IcingaAgentLogFile`
## 1.6.1 (2021-09-15) ## 1.6.1 (2021-09-15)

View file

@ -1,5 +1,47 @@
function Read-IcingaAgentLogFile() function Read-IcingaAgentLogFile()
{ {
if ((Test-IcingaAgentFeatureEnabled -Feature 'windowseventlog') -And ([version](Get-IcingaAgentVersion).Full) -ge (New-IcingaVersionObject -Version '2.13.0')) {
# Icinga 2.13.0 and beyond will log directly into the EventLog
$LastEvent = $null;
$LastMessage = $null;
$LastId = $null;
while ($TRUE) {
$IcingaEvents = Get-WinEvent -LogName Application -MaxEvents 500 -ErrorAction Stop | Sort-Object { $_.TimeCreated };
foreach ($event in $IcingaEvents) {
if ($event.ProviderName -ne 'Icinga 2') {
continue;
}
if ($null -ne $LastEvent -And $event.TimeCreated -lt $LastEvent) {
continue;
}
if ($event.TimeCreated -eq $LastEvent -And (Get-StringSha1 -Content $event.Message) -eq $LastMessage -And $event.Id -eq $LastId) {
continue;
}
$LastEvent = [DateTime]$event.TimeCreated;
$LastMessage = (Get-StringSha1 -Content $event.Message);
$LastId = $event.Id;
$ForeColor = 'White';
if ($event.Level -eq 3) { # Warning
$ForeColor = 'DarkYellow';
} elseif ($event.Level -eq 2) { # Error
$ForeColor = 'Red';
}
Write-IcingaConsolePlain -Message '[{0}] {1}' -Objects $event.TimeCreated, $event.Message -ForeColor $ForeColor;
}
Start-Sleep -Seconds 1;
}
} else {
$Logfile = Join-Path -Path (Get-IcingaAgentLogDirectory) -ChildPath 'icinga2.log'; $Logfile = Join-Path -Path (Get-IcingaAgentLogDirectory) -ChildPath 'icinga2.log';
if ((Test-Path $Logfile) -eq $FALSE) { if ((Test-Path $Logfile) -eq $FALSE) {
Write-IcingaConsoleError 'Icinga 2 logfile not present. Unable to load it'; Write-IcingaConsoleError 'Icinga 2 logfile not present. Unable to load it';
@ -7,4 +49,5 @@ function Read-IcingaAgentLogFile()
} }
Get-Content -Path $Logfile -Tail 20 -Wait; Get-Content -Path $Logfile -Tail 20 -Wait;
}
} }