[Logcheck-commits] Gerfried Fuchs: also allow nagios3 as string (closes: #514335)

[Gerfried Fuchs]

Module: logcheck
Branch: 1.2
Commit: f3f29221c46d69992ebfde9610d6746d6bfcc179
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=f3f29221c46d69992ebfde9610d6746d6bfcc179

Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Mon Feb  9 21:29:39 2009 +0100

also allow nagios3 as string (closes: #514335)

---

 debian/changelog                                   |    5 ++-
 rulefiles/linux/ignore.d.server/nagios             |   38 ++++++++++----------
 .../linux/violations.ignore.d/logcheck-nagios      |    2 +-
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 900f3f4..7456abb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,9 +8,10 @@ logcheck (1.2.69) unstable; urgency=low
       + ignore client connection messages (closes: #495923).
     - violations.d/su:
       + match both, user-root and user:root styles (closes: #491694).
+  * ignore.d.server/nagios, violations.ignore.d/logcheck-nagios: also support
+    nagios3 as string in the log lines (closes: #514335).
 
-
- -- Gerfried Fuchs <rhonda at debian.at>  Wed, 24 Sep 2008 14:02:56 +0200
+ -- Gerfried Fuchs <rhonda at debian.at>  Mon, 09 Feb 2009 21:29:26 +0100
 
 logcheck (1.2.68) unstable; urgency=low
 
diff --git a/rulefiles/linux/ignore.d.server/nagios b/rulefiles/linux/ignore.d.server/nagios
index 312efc0..9034c53 100644
--- a/rulefiles/linux/ignore.d.server/nagios
+++ b/rulefiles/linux/ignore.d.server/nagios
@@ -1,21 +1,21 @@
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: Auto-save of retention data completed successfully\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: LOG ROTATION: (DAILY|WEEKLY|MONTHLY)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: Nagios (1|2)\.[0-9] starting\.\.\. \(PID=[0-9]+\)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: Caught SIGHUP, restarting\.\.\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: SERVICE ALERT: [._[:alnum:]-]+;[^;]+;(CRITICAL|WARNING|OK|UNKNOWN);(SOFT|HARD);.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: SERVICE NOTIFICATION: [._[:alnum:]-]+;[._[:alnum:]-]+;[^;]+;(ACKNOWLEDGEMENT \()?(CRITICAL|WARNING|OK|UNKNOWN)(\))?;.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: SERVICE FLAPPING ALERT: [._[:alnum:]-]+;[._[:alnum:]-]+;(STARTED|STOPPED); Service appears to have (started|stopped) flapping \([0-9.]+% change [<>] [.[:digit:]]+% threshold\)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: HOST ALERT: [._[:alnum:]-]+;(DOWN|UP|UNREACHABLE);(SOFT|HARD);.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: HOST NOTIFICATION: [._[:alnum:]-]+;[._[:alnum:]-]+;(DOWN|UP|UNREACHABLE);.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: HOST DOWNTIME ALERT: [._[:alnum:]-]+;(STARTED|STOPPED);.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: HOST EVENT HANDLER: [._[:alnum:]-]+;(UP|DOWN);(SOFT|HARD);[0-9]+;.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: EXTERNAL COMMAND: PROCESS_SERVICE_CHECK_RESULT;[._[:alnum:]-]+;[^;]+;[0-9]+;.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: EXTERNAL COMMAND: (ENABLE|DISABLE)_(HOST_|HOST_SVC_|SVC_)?NOTIFICATIONS;[._[:alnum:]-]+(;[^;]+)?$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: EXTERNAL COMMAND: (ADD_SVC_COMMENT|ACKNOWLEDGE_SVC_PROBLEM);[._[:alnum:]-]+;[[:alnum:]]+;[0-9]+;([[:alnum:]]+;)?.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: EXTERNAL COMMAND: SCHEDULE_HOST_DOWNTIME;[._[:alnum:]-]+;[0-9;]+;[[:alnum:]]+;.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: Warning: The results of service '[ [:alnum:][:punct:]]+' on host '[._[:alnum:]-]+' are stale by [[:digit:]]+ seconds \(threshold=[[:digit:]]+ seconds\).  I'm forcing an immediate check of the service\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: SERVICE ALERT: [[:alnum:]]+;PING;(WARNING|OK).*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: Auto-save of retention data completed successfully\.$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: LOG ROTATION: (DAILY|WEEKLY|MONTHLY)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: Nagios (1|2)\.[0-9] starting\.\.\. \(PID=[0-9]+\)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: Caught SIGHUP, restarting\.\.\.$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: SERVICE ALERT: [._[:alnum:]-]+;[^;]+;(CRITICAL|WARNING|OK|UNKNOWN);(SOFT|HARD);.*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: SERVICE NOTIFICATION: [._[:alnum:]-]+;[._[:alnum:]-]+;[^;]+;(ACKNOWLEDGEMENT \()?(CRITICAL|WARNING|OK|UNKNOWN)(\))?;.*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: SERVICE FLAPPING ALERT: [._[:alnum:]-]+;[._[:alnum:]-]+;(STARTED|STOPPED); Service appears to have (started|stopped) flapping \([0-9.]+% change [<>] [.[:digit:]]+% threshold\)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: HOST ALERT: [._[:alnum:]-]+;(DOWN|UP|UNREACHABLE);(SOFT|HARD);.*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: HOST NOTIFICATION: [._[:alnum:]-]+;[._[:alnum:]-]+;(DOWN|UP|UNREACHABLE);.*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: HOST DOWNTIME ALERT: [._[:alnum:]-]+;(STARTED|STOPPED);.*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: HOST EVENT HANDLER: [._[:alnum:]-]+;(UP|DOWN);(SOFT|HARD);[0-9]+;.*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: EXTERNAL COMMAND: PROCESS_SERVICE_CHECK_RESULT;[._[:alnum:]-]+;[^;]+;[0-9]+;.*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: EXTERNAL COMMAND: (ENABLE|DISABLE)_(HOST_|HOST_SVC_|SVC_)?NOTIFICATIONS;[._[:alnum:]-]+(;[^;]+)?$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: EXTERNAL COMMAND: (ADD_SVC_COMMENT|ACKNOWLEDGE_SVC_PROBLEM);[._[:alnum:]-]+;[[:alnum:]]+;[0-9]+;([[:alnum:]]+;)?.*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: EXTERNAL COMMAND: SCHEDULE_HOST_DOWNTIME;[._[:alnum:]-]+;[0-9;]+;[[:alnum:]]+;.*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: Warning: The results of service '[ [:alnum:][:punct:]]+' on host '[._[:alnum:]-]+' are stale by [[:digit:]]+ seconds \(threshold=[[:digit:]]+ seconds\).  I'm forcing an immediate check of the service\.$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: SERVICE ALERT: [[:alnum:]]+;PING;(WARNING|OK).*$
 # nrpe
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nrpe\[[0-9]+\]: Error: Could not complete SSL handshake. 5$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: Warning: Host '[[:alnum:]]+' has no services associated with it\!$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: LOG VERSION: 2\.[0-9]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: Warning: Host '[[:alnum:]]+' has no services associated with it\!$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: LOG VERSION: 2\.[0-9]$
diff --git a/rulefiles/linux/violations.ignore.d/logcheck-nagios b/rulefiles/linux/violations.ignore.d/logcheck-nagios
index fdda451..0f3b464 100644
--- a/rulefiles/linux/violations.ignore.d/logcheck-nagios
+++ b/rulefiles/linux/violations.ignore.d/logcheck-nagios
@@ -1 +1 @@
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: SERVICE NOTIFICATION: [._[:alnum:]-]+;[._[:alnum:]-]+;[^;]+;CRITICAL;.*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios(2|3)?: SERVICE NOTIFICATION: [._[:alnum:]-]+;[._[:alnum:]-]+;[^;]+;CRITICAL;.*$