[Logcheck-commits] r1267 - in logcheck/trunk: debian rulefiles/linux/ignore.d.server rulefiles/linux/violations.ignore.d

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-10-19 07:51:05 +0000 (Thu, 19 Oct 2006)
New Revision: 1267

Modified:
   logcheck/trunk/debian/changelog
   logcheck/trunk/rulefiles/linux/ignore.d.server/nagios
   logcheck/trunk/rulefiles/linux/violations.ignore.d/logcheck-nagios
Log:
* violations.ignore.d/logcheck-nagios, ignore.d.server/nagios: extended
  rules to support nagios2; thanks to Cyril Chaboisseau (closes: #355364).

Modified: logcheck/trunk/debian/changelog
===================================================================
--- logcheck/trunk/debian/changelog	2006-10-19 07:49:40 UTC (rev 1266)
+++ logcheck/trunk/debian/changelog	2006-10-19 07:51:05 UTC (rev 1267)
@@ -14,8 +14,10 @@
     CONNECT; thanks to Martin Lohmeier (closes: #373174).
   * ignore.d.server/saslauthd, violations-ignore.d/logcheck-saslauthd: ignore
     messages about unknown users or invalid passwords (closes: #369486).
+  * violations.ignore.d/logcheck-nagios, ignore.d.server/nagios: extended
+    rules to support nagios2; thanks to Cyril Chaboisseau (closes: #355364).
 
- -- martin f. krafft <madduck at debian.org>  Thu, 19 Oct 2006 09:48:41 +0200
+ -- martin f. krafft <madduck at debian.org>  Thu, 19 Oct 2006 09:50:33 +0200
 
 logcheck (1.2.49~unreleased.2) UNRELEASED; urgency=low
 

Modified: logcheck/trunk/rulefiles/linux/ignore.d.server/nagios
===================================================================
--- logcheck/trunk/rulefiles/linux/ignore.d.server/nagios	2006-10-19 07:49:40 UTC (rev 1266)
+++ logcheck/trunk/rulefiles/linux/ignore.d.server/nagios	2006-10-19 07:51:05 UTC (rev 1267)
@@ -1,19 +1,19 @@
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: Auto-save of retention data completed successfully\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: LOG ROTATION: (DAILY|WEEKLY|MONTHLY)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: Nagios 1\.[0-9] starting\.\.\. \(PID=[0-9]+\)$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: Caught SIGHUP, restarting\.\.\.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: SERVICE ALERT: [._[:alnum:]-]+;[^;]+;(CRITICAL|WARNING|OK|UNKNOWN);(SOFT|HARD);.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: SERVICE NOTIFICATION: [._[:alnum:]-]+;[._[:alnum:]-]+;[^;]+;(ACKNOWLEDGEMENT \()?(CRITICAL|WARNING|OK|UNKNOWN)(\))?;.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: 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: HOST ALERT: [._[:alnum:]-]+;(DOWN|UP|UNREACHABLE);(SOFT|HARD);.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: HOST NOTIFICATION: [._[:alnum:]-]+;[._[:alnum:]-]+;(DOWN|UP|UNREACHABLE);.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: HOST DOWNTIME ALERT: [._[:alnum:]-]+;(STARTED|STOPPED);.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: HOST EVENT HANDLER: [._[:alnum:]-]+;DOWN;(SOFT|HARD);[0-9]+;.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: EXTERNAL COMMAND: PROCESS_SERVICE_CHECK_RESULT;[._[:alnum:]-]+;[^;]+;[0-9]+;.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: EXTERNAL COMMAND: (ENABLE|DISABLE)_(HOST_|HOST_SVC_|SVC_)?NOTIFICATIONS;[._[:alnum:]-]+(;[^;]+)?$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: EXTERNAL COMMAND: (ADD_SVC_COMMENT|ACKNOWLEDGE_SVC_PROBLEM);[._[:alnum:]-]+;[[:alnum:]]+;[0-9]+;([[:alnum:]]+;)?.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: EXTERNAL COMMAND: SCHEDULE_HOST_DOWNTIME;[._[:alnum:]-]+;[0-9;]+;[[:alnum:]]+;.*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: 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: SERVICE ALERT: [[:alnum:]]+;PING;(WARNING|OK).*$
+^\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\.[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:]-]+;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).*$
 # nrpe
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nrpe\[[0-9]+\]: Error: Could not complete SSL handshake. 5$

Modified: logcheck/trunk/rulefiles/linux/violations.ignore.d/logcheck-nagios
===================================================================
--- logcheck/trunk/rulefiles/linux/violations.ignore.d/logcheck-nagios	2006-10-19 07:49:40 UTC (rev 1266)
+++ logcheck/trunk/rulefiles/linux/violations.ignore.d/logcheck-nagios	2006-10-19 07:51:05 UTC (rev 1267)
@@ -1 +1 @@
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios: SERVICE NOTIFICATION: [._[:alnum:]-]+;[._[:alnum:]-]+;[^;]+;CRITICAL;.*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ nagios2?: SERVICE NOTIFICATION: [._[:alnum:]-]+;[._[:alnum:]-]+;[^;]+;CRITICAL;.*$