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

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-12-28 12:19:02 +0100 (Thu, 28 Dec 2006)
New Revision: 1410

Modified:
   logcheck/trunk/debian/changelog
   logcheck/trunk/rulefiles/linux/ignore.d.server/nagios
Log:
* ignore.d.server/nagios: fix filters; thanks to Esteban Cerutti
  (closes: #401717).

Modified: logcheck/trunk/debian/changelog
===================================================================
--- logcheck/trunk/debian/changelog	2006-12-28 11:15:59 UTC (rev 1409)
+++ logcheck/trunk/debian/changelog	2006-12-28 11:19:02 UTC (rev 1410)
@@ -52,11 +52,14 @@
   * ignore.d.server/lpr: ignore restart message; thanks to Russ Albery
     (closes: #400427).
 
+  * ignore.d.server/nagios: fix filters; thanks to Esteban Cerutti
+    (closes: #401717).
+
   * Added Spanish debconf translation by Javier Fernández-Sanguino
     (closes: #402204).
   * Do not source debconf confmodule in preinst as it's not needed.
 
- -- martin f. krafft <madduck at debian.org>  Thu, 28 Dec 2006 12:15:14 +0100
+ -- martin f. krafft <madduck at debian.org>  Thu, 28 Dec 2006 12:18:15 +0100
 
 logcheck (1.2.51) unstable; urgency=medium
 

Modified: logcheck/trunk/rulefiles/linux/ignore.d.server/nagios
===================================================================
--- logcheck/trunk/rulefiles/linux/ignore.d.server/nagios	2006-12-28 11:15:59 UTC (rev 1409)
+++ logcheck/trunk/rulefiles/linux/ignore.d.server/nagios	2006-12-28 11:19:02 UTC (rev 1410)
@@ -1,6 +1,6 @@
 ^\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?: 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)(\))?;.*$
@@ -8,7 +8,7 @@
 ^\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?: 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:]]+;)?.*$
@@ -17,3 +17,5 @@
 ^\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$
+^\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]$