summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2014-12-11 21:16:56 +0000
committerMicah <micah@riseup.net>2014-12-11 21:16:56 +0000
commit354809addebc139b928b14291d6129bfefdcd074 (patch)
treebcc0675cafd918f67fbe0925609f52e4eba33380
parentbf2132966cb442f8458f6a8954e20901ef146c57 (diff)
parentc6104cc1ffaca59544f4b4966a640be1ebcfa662 (diff)
Merge branch '6539_increase_time_between_check_mk_agent_runs' into 'develop'
6539 increase time between check mk agent runs https://leap.se/code/issues/6539 See merge request !11
-rw-r--r--puppet/modules/site_check_mk/files/extra_service_conf.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/modules/site_check_mk/files/extra_service_conf.mk b/puppet/modules/site_check_mk/files/extra_service_conf.mk
index 51f348f1..03d1ea76 100644
--- a/puppet/modules/site_check_mk/files/extra_service_conf.mk
+++ b/puppet/modules/site_check_mk/files/extra_service_conf.mk
@@ -1,3 +1,13 @@
+# retry 3 times before setting a service into a hard state
+# and send out notification
extra_service_conf["max_check_attempts"] = [
("4", ALL_HOSTS , ALL_SERVICES )
]
+
+# run check_mk_agent every 2 minutes if it terminates
+# successfully.
+# see https://leap.se/code/issues/6539 for the rationale
+extra_service_conf["normal_check_interval"] = [
+ ("2", ALL_HOSTS , "Check_MK" )
+]
+