martin f. krafft: Updated logcheck rule so that it matches mdadm log entries with and without PID (2.6.5 introduces PIDs in the messages).

[Martin F. Krafft]

Module: mdadm
Branch: master
Commit: 677b5400b5564373e0030ddda1ff63ccf79f529b
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=677b5400b5564373e0030ddda1ff63ccf79f529b

Author: martin f. krafft <madduck at madduck.net>
Date:   Tue Jun 24 21:16:33 2008 +0100

Updated logcheck rule so that it matches mdadm log entries with and without PID (2.6.5 introduces PIDs in the messages).

---

 debian/changelog                    |    2 ++
 debian/mdadm.logcheck.ignore.server |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b0b37c..506d883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ mdadm (2.6.7-1) UNRELEASED; urgency=low
   * Updated debconf translations:
     - Spanish; thanks to Javier Fernández-Sanguino (closes: #477920).
     - Basque; thanks to Piarres Beobide (closes: #478676).
+  * Updated logcheck rule so that it matches mdadm log entries with and without
+    PID (2.6.5 introduces PIDs in the messages).
 
  -- martin f. krafft <madduck at debian.org>  Tue, 29 Apr 2008 13:43:02 +0200
 
diff --git a/debian/mdadm.logcheck.ignore.server b/debian/mdadm.logcheck.ignore.server
index 823e63a..84a1f9b 100644
--- a/debian/mdadm.logcheck.ignore.server
+++ b/debian/mdadm.logcheck.ignore.server
@@ -17,7 +17,7 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel: RAID([01456]|10) conf printout:$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel:[[:space:]]+---( [wrf]d:[[:digit:]]+){2,3}$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel:[[:space:]]+disk [[:digit:]]+,( wo:[[:digit:]]+,)? o:[[:digit:]]+, dev:[[:alnum:]]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ mdadm: Rebuild((Start|Finish)ed|[2468]0) event detected on md device /dev/[-_./[:alnum:]]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ mdadm: SpareActive event detected on md device /dev/[-_./[:alnum:]]+, component device /dev/[-_./[:alnum:]]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ mdadm: (New|Degraded)Array event detected on md device /dev/[-_./[:alnum:]]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ mdadm: DeviceDisappeared event detected on md device /dev/[-_./[:alnum:]]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ mdadm(\[[[:digit:]]+\])?: Rebuild((Start|Finish)ed|[2468]0) event detected on md device /dev/[-_./[:alnum:]]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ mdadm(\[[[:digit:]]+\])?: SpareActive event detected on md device /dev/[-_./[:alnum:]]+, component device /dev/[-_./[:alnum:]]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ mdadm(\[[[:digit:]]+\])?: (New|Degraded)Array event detected on md device /dev/[-_./[:alnum:]]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ mdadm(\[[[:digit:]]+\])?: DeviceDisappeared event detected on md device /dev/[-_./[:alnum:]]+$