summaryrefslogtreecommitdiff
path: root/puppet/modules/site_check_mk
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-12-12 06:34:20 +0000
committervarac <varacanero@zeromail.org>2014-12-12 06:34:20 +0000
commitc85c1539b60ac26c86a17cd882129f49c2116564 (patch)
tree4c00cba26dd34b7c1c5b80bf1a9fbc0e850f9743 /puppet/modules/site_check_mk
parentf5dc9ef60a0dd4d81ed594667cf66a2dc274e4d2 (diff)
parenta64b2081b872823f2d539b48151bc0d323b42453 (diff)
Merge branch 'bug/6542' into 'develop'
Bug/6542 See merge request !14
Diffstat (limited to 'puppet/modules/site_check_mk')
-rw-r--r--puppet/modules/site_check_mk/files/agent/logwatch/syslog/tapicero.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_check_mk/files/agent/logwatch/syslog/tapicero.cfg b/puppet/modules/site_check_mk/files/agent/logwatch/syslog/tapicero.cfg
index c998322c..d9f0eafc 100644
--- a/puppet/modules/site_check_mk/files/agent/logwatch/syslog/tapicero.cfg
+++ b/puppet/modules/site_check_mk/files/agent/logwatch/syslog/tapicero.cfg
@@ -1,5 +1,5 @@
# Ignore transient Tapicero errors when creating a db (#6511)
- I tapicero.*(Creating database|Writing security to|Uploading design doc to) user-.* failed (\(trying again soon\)|twice due to): RestClient::InternalServerError: 500 Internal Server Error
+ I tapicero.*(Creating database|Checking security of|Writing security to|Uploading design doc to) user-.* failed (\(trying again soon\)|twice due to): (RestClient::Resource Not Found|RestClient::InternalServerError): (404 Resource Not Found|500 Internal Server Error)
C tapicero.*RestClient::InternalServerError:
# possible race condition between multiple tapicero
# instances, so we ignore it