summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-11-28 22:22:41 +0100
committervarac <varacanero@zeromail.org>2014-12-01 11:17:54 +0100
commit989c203002c812b1e6089232409aab08c80aec5d (patch)
tree3cd38cc3b7b59b33fabb366decad51caf09bee33
parent1de9dd7b9297cdd67f8bf51352e5dcea08f5fb29 (diff)
Increase nagios max_checks_attempts from 1 to 4 so notifications won't be sent out on first failed check_mk check (Bug #6461)
Change-Id: I1bd47b3c3d17508488a4db90d74118006d85a03a
-rw-r--r--puppet/modules/site_check_mk/files/extra_service_conf.mk3
-rw-r--r--puppet/modules/site_check_mk/manifests/server.pp6
2 files changed, 9 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
new file mode 100644
index 00000000..51f348f1
--- /dev/null
+++ b/puppet/modules/site_check_mk/files/extra_service_conf.mk
@@ -0,0 +1,3 @@
+extra_service_conf["max_check_attempts"] = [
+ ("4", ALL_HOSTS , ALL_SERVICES )
+]
diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp
index 93107b04..b384923c 100644
--- a/puppet/modules/site_check_mk/manifests/server.pp
+++ b/puppet/modules/site_check_mk/manifests/server.pp
@@ -48,10 +48,16 @@ class site_check_mk::server {
source => 'puppet:///modules/site_check_mk/ignored_services.mk',
notify => Exec['check_mk-refresh'],
require => Package['check-mk-server'];
+ '/etc/check_mk/conf.d/extra_service_conf.mk':
+ source => 'puppet:///modules/site_check_mk/extra_service_conf.mk',
+ notify => Exec['check_mk-refresh'],
+ require => Package['check-mk-server'];
+
'/etc/check_mk/all_hosts_static':
content => $all_hosts,
notify => Exec['check_mk-refresh'],
require => Package['check-mk-server'];
+
'/etc/check_mk/.ssh':
ensure => directory,
require => Package['check-mk-server'];