[pkg-nagios-changes] [Git][nagios-team/check-logfiles][master] 2 commits: Add DEP-3 headers.

[Hilmar Preuße (@hilmar-guest)]

Hilmar Preuße pushed to branch master at Debian Nagios Maintainer Group / check-logfiles


Commits:
772798d3 by Hilmar Preusse at 2024-01-16T22:49:33+00:00
Add DEP-3 headers.

- - - - -
fd0cd9e5 by Hilmar Preusse at 2024-01-16T22:49:33+00:00
Add ability to search systemd journals by syslog identifiers.

- - - - -


5 changed files:

- debian/changelog
- + debian/patches/debian_1060859
- debian/patches/dont_load_windows_modules
- debian/patches/exit_after_successful_test
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -19,6 +19,8 @@ monitoring-plugins-check-logfiles (4.1.1-3) unstable; urgency=medium
   * Run test suite provided by upstream author; remove failing tests.
     The issues are reported at upstream:
     https://github.com/lausser/check_logfiles/issues/73
+  * Add patch to search systemd journals by syslog identifiers.
+    https://github.com/lausser/check_logfiles/pull/80
 
  -- Hilmar Preusse <hille42 at web.de>  Fri, 20 Jan 2023 23:18:33 +0100
 


=====================================
debian/patches/debian_1060859
=====================================
@@ -0,0 +1,40 @@
+Description: Add ability to search systemd journals by syslog identifiers
+Forwarded: https://github.com/lausser/check_logfiles/pull/80
+Author: John Lines <john+reportbug at paladyn.org>
+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;


=====================================
debian/patches/dont_load_windows_modules
=====================================
@@ -1,3 +1,8 @@
+Description: Load Nagios::CheckLogfiles::Search::Eventlog only if we are on Windows.
+Forwarded: https://github.com/lausser/check_logfiles/pull/77
+Author: Hilmar Preuße <hille42 at web.de>
+Last-Update: 2023-01-19
+
 --- check_logfiles.orig/t/040wevtutilfilt.t
 +++ check_logfiles/t/040wevtutilfilt.t
 @@ -10,7 +10,6 @@


=====================================
debian/patches/exit_after_successful_test
=====================================
@@ -1,3 +1,8 @@
+Description: Workaround for broken self tests. Exit after last successful test.
+Forwarded: not-needed
+Origin: Debian
+Author: Hilmar Preuße <hille42 at web.de>
+
 --- check_logfiles.orig/t/100flooddetect.t
 +++ check_logfiles/t/100flooddetect.t
 @@ -15,7 +15,7 @@


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 dont_load_windows_modules
 exit_after_successful_test
+debian_1060859



View it on GitLab: https://salsa.debian.org/nagios-team/check-logfiles/-/compare/3b8accb1b107da80a6ee25c4ed10657dd64df926...fd0cd9e59ea7daea2e16c50237dd2281f5e1e62e

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/check-logfiles/-/compare/3b8accb1b107da80a6ee25c4ed10657dd64df926...fd0cd9e59ea7daea2e16c50237dd2281f5e1e62e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20240116/9a42e1e8/attachment-0001.htm>