diff options
| author | varac <varacanero@zeromail.org> | 2015-08-13 07:28:26 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-08-13 07:51:57 +0200 |
| commit | c4ddd197a1ca6a3fac70a86a3ed3dc3d4920e3ca (patch) | |
| tree | 6ea0bf6f1afbd163d8a599e35faaccf2dab115b4 | |
| parent | e6f6324ebea9fc46d5d617a08c2eb239349d9f90 (diff) | |
Increase readability of nagios notification mail subjects (#6847)
Change-Id: Ic9af9ef3602abbb51edf1c9d71d4d264b4ace714
| -rw-r--r-- | puppet/modules/site_check_mk/files/extra_host_conf.mk | 6 | ||||
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/server.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_check_mk/templates/extra_host_conf.mk | 13 |
3 files changed, 14 insertions, 7 deletions
diff --git a/puppet/modules/site_check_mk/files/extra_host_conf.mk b/puppet/modules/site_check_mk/files/extra_host_conf.mk deleted file mode 100644 index 2c96f97a..00000000 --- a/puppet/modules/site_check_mk/files/extra_host_conf.mk +++ /dev/null @@ -1,6 +0,0 @@ -# retry 3 times before setting a host into a hard state -# and send out notification -extra_host_conf["max_check_attempts"] = [ - ("4", ALL_HOSTS ) -] - diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp index 67519513..57f68d3e 100644 --- a/puppet/modules/site_check_mk/manifests/server.pp +++ b/puppet/modules/site_check_mk/manifests/server.pp @@ -54,7 +54,7 @@ class site_check_mk::server { notify => Exec['check_mk-refresh'], require => Package['check-mk-server']; '/etc/check_mk/conf.d/extra_host_conf.mk': - source => 'puppet:///modules/site_check_mk/extra_host_conf.mk', + content => template('site_check_mk/extra_host_conf.mk'), notify => Exec['check_mk-refresh'], require => Package['check-mk-server']; diff --git a/puppet/modules/site_check_mk/templates/extra_host_conf.mk b/puppet/modules/site_check_mk/templates/extra_host_conf.mk new file mode 100644 index 00000000..bc27b514 --- /dev/null +++ b/puppet/modules/site_check_mk/templates/extra_host_conf.mk @@ -0,0 +1,13 @@ +# retry 3 times before setting a host into a hard state +# and send out notification +extra_host_conf["max_check_attempts"] = [ + ("4", ALL_HOSTS ) +] + +# Use hostnames as alias so notification mail subjects +# are more readable and not so long. Alias defaults to +# the fqdn of a host is not changed. +extra_host_conf["alias"] = [ +<% @hosts.keys.sort.each do |key| -%> ( "<%= key.strip %>", ["<%= @hosts[key]['domain_internal']%>"]), +<% end -%> +] |