summaryrefslogtreecommitdiff
path: root/puppet/modules/site_check_mk
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-12-16 17:40:41 +0000
committervarac <varacanero@zeromail.org>2014-12-16 17:40:41 +0000
commit1c7e52d63ea9d448260afc57171a5b5edd760185 (patch)
tree1a290f080a914730a4aa9e710a982d426faf50dc /puppet/modules/site_check_mk
parentaedd6a57b5bf2a5d53cb19d181f90d78918ddf75 (diff)
parent970af8cf4a7670c01cd06b45a09f010d91949a2f (diff)
Merge branch 'bug/6512' into 'develop'
Bug/6512 See merge request !15
Diffstat (limited to 'puppet/modules/site_check_mk')
-rw-r--r--puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg2
-rw-r--r--puppet/modules/site_check_mk/files/agent/logwatch/syslog_tail.cfg4
2 files changed, 3 insertions, 3 deletions
diff --git a/puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg b/puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg
index 5cd2a47b..3d5ada42 100644
--- a/puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg
+++ b/puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg
@@ -14,7 +14,7 @@
I Uncaught error in HTTP request: {exit,normal}
I Uncaught error in HTTP request: {exit,
# Ignore rexi_EXIT bigcouch error (Bug #6512)
- I Error in process <[0-9.]+> on node .* with exit value: {{rexi_EXIT,{killed,\[{couch_db,collect_results
+ I Error in process <[0-9.]+> on node .* with exit value: {{rexi_EXIT,{(killed|noproc|shutdown),\[{couch_db,collect_results
C Uncaught error in HTTP request: {error,
C Response abnormally terminated: {nodedown,
C rexi_DOWN,noproc
diff --git a/puppet/modules/site_check_mk/files/agent/logwatch/syslog_tail.cfg b/puppet/modules/site_check_mk/files/agent/logwatch/syslog_tail.cfg
index b19ac241..b8f47434 100644
--- a/puppet/modules/site_check_mk/files/agent/logwatch/syslog_tail.cfg
+++ b/puppet/modules/site_check_mk/files/agent/logwatch/syslog_tail.cfg
@@ -5,11 +5,11 @@
C panic
C Oops
C Error
+# ignore ipv6 icmp errors for now (Bug #6540)
+ I kernel: .*icmpv6_send: no reply to icmp error
C error
W generic protection rip
W .*Unrecovered read error - auto reallocate failed
# 401 Unauthorized error logged by webapp and possible other
# applications
C Unauthorized
-# ignore ipv6 icmp errors for now (Bug #6540)
- I kernel: .*icmpv6_send: no reply to icmp error