[Logcheck-commits] Frédéric Brière : Updated cron-apt rules to match all possible sizes and lengths

[Frédéric Brière]

Module: logcheck
Branch: master
Commit: 1a5c3c375dfc85ef2f4a4fda40fbf1443635d747
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=1a5c3c375dfc85ef2f4a4fda40fbf1443635d747

Author: Frédéric Brière <fbriere at fbriere.net>
Date:   Mon Aug 17 16:32:27 2009 -0400

Updated cron-apt rules to match all possible sizes and lengths

(While I seriously doubt we'll be fetching yottabytes any soon, libapt
is already prepared for that eventuality.)

---

 debian/changelog                         |    1 +
 rulefiles/linux/ignore.d.server/cron-apt |   12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1055309..2beef87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ logcheck (1.3.4) experimental; urgency=low
   * Added libpam-mount "Command successful" rule
   * Adjusted ssh "Authentication failure" rule for "invalid user"
   * Updated cron-apt "Fetched" rule to match new time formats
+  * Updated cron-apt "Fetched" rule to match all possible sizes and lengths
 
  -- Frédéric Brière <fbriere at fbriere.net>  Mon, 17 Aug 2009 11:48:08 -0400
 
diff --git a/rulefiles/linux/ignore.d.server/cron-apt b/rulefiles/linux/ignore.d.server/cron-apt
index 4da55cd..90b55e3 100644
--- a/rulefiles/linux/ignore.d.server/cron-apt
+++ b/rulefiles/linux/ignore.d.server/cron-apt
@@ -1,6 +1,6 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cron-apt: E: Some index files failed to download, they have been ignored, or old ones used instead\.$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: After this operation, [.[:digit:]]+[gmk]?B of additional disk space will be used\.$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: After unpacking [[:digit:].]+([kM]?B) (of additional disk space will be used|disk space will be freed)\.$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: After this operation, [.[:digit:]]+[kMGTPEZY]?B of additional disk space will be used\.$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: After unpacking [[:digit:].]+([kMGTPEZY]?B) (of additional disk space will be used|disk space will be freed)\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Building [dD]ependency [tT]ree\.\.\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: CRON-APT ACTION: (0-update|3-download)$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: CRON-APT LINE: (/usr/bin/apt-get )?autoclean -y$
@@ -8,12 +8,12 @@
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: CRON-APT LINE: (/usr/bin/apt-get )?update -o quiet=2$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: CRON-APT RUN \[[-[:alnum:]/]+\]: \w{3} \w{3} [ [:digit:]]+ [:[:digit:]]{8} \w{3,4} [[:digit:]]{4}$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: CRON-APT SLEEP: [[:digit:]]+, \w{3} \w{3} [ [:digit:]]+ [:[:digit:]]{8} \w{3,4} [[:digit:]]{4}$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Del [-[:alnum:]_+.]+ \[[.[:digit:]]+[kM]?B\]$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Del [-[:alnum:]_+.]+ \[[.[:digit:]]+[kMGTPEZY]?B\]$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Download complete and in download only mode$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: E: Some index files failed to download, they have been ignored, or old ones used instead\.$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Fetched [[:digit:].]+[kM]?B in ([[:digit:]]+m(in)? ?)?[[:digit:]]+s \([[:digit:].]+[kM]?B/s\)$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Get:[[:digit:]]+ ((ht|f)tp|file)://[.[:alnum:]/_-]+ [./[:alnum:]-]+ [-[:alnum:]_+.]+ [+.:~[:alnum:]-]+ \[[.[:digit:]]+[kM]?B\]$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Need to get [[:digit:].]+([kM]?B)(/[.[:digit:]]+([kM]?B))* of archives\.$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Fetched [[:digit:].]+[kMGTPEZY]?B in ((([[:digit:]]+d )?[[:digit:]]+h ?)?[[:digit:]]+m(in)? ?)?[[:digit:]]+s \([[:digit:].]+[kMGTPEZY]?B/s\)$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Get:[[:digit:]]+ ((ht|f)tp|file)://[.[:alnum:]/_-]+ [./[:alnum:]-]+ [-[:alnum:]_+.]+ [+.:~[:alnum:]-]+ \[[.[:digit:]]+[kMGTPEZY]?B\]$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Need to get [[:digit:].]+([kMGTPEZY]?B)(/[.[:digit:]]+([kMGTPEZY]?B))* of archives\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Reading [pP]ackage [lL]ists\.\.\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Reading state information\.\.\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: The following NEW packages will be installed:$