Description: Add ability to search systemd journals by syslog identifiers Forwarded: https://github.com/lausser/check_logfiles/pull/80 Author: John Lines Last-Update: 2024-01-15 diff --git a/plugins-scripts/Nagios/CheckLogfiles/Search/Journald.pm b/plugins-scripts/Nagios/CheckLogfiles/Search/Journald.pm index 45a4ac4..b9d28cc 100755 --- a/plugins-scripts/Nagios/CheckLogfiles/Search/Journald.pm +++ b/plugins-scripts/Nagios/CheckLogfiles/Search/Journald.pm @@ -26,6 +26,7 @@ sub init { if ($self->{journaldunit} and $self->{tag} eq "default") { $self->{tag} = $self->{journaldunit}; } + $self->{journaldidentifier} = $params->{journald}->{identifier}; $self->default_options({ exeargs => "", }); $self->SUPER::init($params); } @@ -49,6 +50,9 @@ sub collectfiles { if ($self->{journaldunit}) { $cmdline = $cmdline." --unit '".$self->{journaldunit}."'"; } + if ($self->{journaldidentifier}) { + $cmdline = $cmdline." --identifier '".$self->{journaldidentifier}."'"; + } $cmdline = $cmdline." --since '".strftime("%Y-%m-%d %H:%M:%S", localtime($self->{journald}->{since}))."'|"; if ($fh->open($cmdline)) { push(@{$self->{relevantfiles}}, diff --git a/plugins-scripts/Nagios/Tivoli/Config/Logfile.pm b/plugins-scripts/Nagios/Tivoli/Config/Logfile.pm index ac0d19a..8a3420f 100755 --- a/plugins-scripts/Nagios/Tivoli/Config/Logfile.pm +++ b/plugins-scripts/Nagios/Tivoli/Config/Logfile.pm @@ -5,6 +5,8 @@ # tivoli config files and # return it as hash structure # +# John Lines update to filter on journald:identifier +# to allow, for example --type=journald:identifier='postfix/smtp' package Nagios::Tivoli::Config::Logfile; use strict;