diff options
| author | Varac <varac@leap.se> | 2014-11-21 06:09:35 +0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@review.leap.se> | 2014-11-21 06:09:35 +0800 |
| commit | 885c32447fa4a244f8a996aa8b622d29f130fd87 (patch) | |
| tree | 957529f1c74445bc43b1585b5e956dec467263cb | |
| parent | 503a316e67da2b4e0dbae7db28bbd0574fa3739f (diff) | |
| parent | 6ebd8cee202c81260c151e7903ff2f16518ffa41 (diff) | |
Merge "Fix Check_mk notifications (Bug #6403)" into develop0.6.0rc1
| -rw-r--r-- | puppet/modules/site_check_mk/files/host_contactgroups.mk | 3 | ||||
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/server.pp | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/puppet/modules/site_check_mk/files/host_contactgroups.mk b/puppet/modules/site_check_mk/files/host_contactgroups.mk new file mode 100644 index 00000000..e89323fb --- /dev/null +++ b/puppet/modules/site_check_mk/files/host_contactgroups.mk @@ -0,0 +1,3 @@ +host_contactgroups = [ + ( "admins", ALL_HOSTS ), +] diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp index aa24d96c..388ae94b 100644 --- a/puppet/modules/site_check_mk/manifests/server.pp +++ b/puppet/modules/site_check_mk/manifests/server.pp @@ -40,6 +40,10 @@ class site_check_mk::server { content => template('site_check_mk/hostgroups.mk'), notify => Exec['check_mk-refresh'], require => Package['check-mk-server']; + '/etc/check_mk/conf.d/host_contactgroups.mk': + source => 'puppet:///modules/site_check_mk/host_contactgroups.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'], @@ -64,6 +68,5 @@ class site_check_mk::server { require => Package['nagios-plugins-basic']; } - include check_mk::agent::local_checks } |