summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-02-26 11:08:23 +1100
committerJames Turnbull <james@lovedthanlost.net>2009-02-26 11:08:23 +1100
commit8c010e0ccc8b007f8657a1025d2de36e2310e550 (patch)
treeef2eb27c6d90acd77803faeb3366aba4a51dd514
parent7504b0499170aa81a143f74065507410424e5e17 (diff)
downloadpuppet-8c010e0ccc8b007f8657a1025d2de36e2310e550.tar.gz
puppet-8c010e0ccc8b007f8657a1025d2de36e2310e550.tar.xz
puppet-8c010e0ccc8b007f8657a1025d2de36e2310e550.zip
Fixed #1910 - updated logcheck
-rw-r--r--CHANGELOG2
-rw-r--r--ext/logcheck/puppet3
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 74219a084..e7d3dc4ee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
0.24.8
+ Fixed #1910 - updated logcheck
+
Fixed #1871 - Sensitive information leaked in log reports
Fixed #1956 - Cleaned up variable names to be more sane, clarified error messages
diff --git a/ext/logcheck/puppet b/ext/logcheck/puppet
index 449ec70f5..8f2a7ee70 100644
--- a/ext/logcheck/puppet
+++ b/ext/logcheck/puppet
@@ -1,5 +1,6 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: (Handled resources in|Resource comparison took|Searched for [host|resources|resource params and tags] in) [0-9.]+ seconds
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Starting Puppet server version [.0-9]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Compiled configuration for [._[:alnum:]-]+ in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Compiled catalog for [._[:alnum:]-]+ in [.0-9]+ seconds$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Caught TERM; shutting down$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Shutting down$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Starting Puppet client version [.0-9]+$