diff options
author | varac <varacanero@zeromail.org> | 2014-12-17 09:36:59 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2014-12-17 09:36:59 +0100 |
commit | bbd0bb1e0a497a9aca93065c3c6ec20fafde824a (patch) | |
tree | 928cc7cc67844888af6866437855599be7c18c7c | |
parent | 4f1b850144dd8bd708b09b9e8a47a38f7a5ff458 (diff) | |
parent | 8d6c05adf08eb2ddc29c4481ea06fcf85dda7b26 (diff) |
Merge branch 'micah/platform-feature/6544' into develop
Conflicts:
puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg
Change-Id: I1646e49ffa5437a861b402b755bc15943c42ec4f
-rw-r--r-- | puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg | 4 |
1 files changed, 4 insertions, 0 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 3d5ada42..95ddd2ca 100644 --- a/puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg +++ b/puppet/modules/site_check_mk/files/agent/logwatch/bigcouch.cfg @@ -15,6 +15,10 @@ 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|noproc|shutdown),\[{couch_db,collect_results + # Ignore "Generic server terminating" bigcouch message (Feature #6544) + I Generic server <.*> terminating + I {error_report,<.*>, + I {error_info, C Uncaught error in HTTP request: {error, C Response abnormally terminated: {nodedown, C rexi_DOWN,noproc |