diff options
author | varac <varacanero@zeromail.org> | 2015-05-12 20:18:28 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-05-12 20:18:28 +0200 |
commit | b0c973424dfca43087636ac75f9f0674adda5d6e (patch) | |
tree | 9af886eeee35377f39e1755eaa29f7abeeaabda5 /manifests/config.pp | |
parent | 205859d87884ac4ceee6d1365548e7dc55640bfa (diff) | |
parent | 9930649228a509eda998699e213ed458685763f0 (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/config.pp')
-rw-r--r-- | manifests/config.pp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/manifests/config.pp b/manifests/config.pp index c5440c5..d82044b 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -6,8 +6,18 @@ class check_mk::config ( $bin_dir = "/omd/sites/${site}/bin", $use_storedconfigs = true ) { - file { "${etc_dir}/${nagios_subdir}/local": - ensure => directory, + file { + # for local check_mk checks + "${etc_dir}/${nagios_subdir}/local": + ensure => directory; + + # package provided and check_mk generated files, defined so the nagios + # module doesn't purge them + "${etc_dir}/${nagios_subdir}/conf.d/check_mk": + ensure => directory; + [ "${etc_dir}/${nagios_subdir}/conf.d/check_mk/check_mk_objects.cfg", + "${etc_dir}/${nagios_subdir}/conf.d/check_mk/check_mk_templates.cfg" ]: + ensure => present; } file_line { 'nagios-add-check_mk-cfg_dir': ensure => present, @@ -41,6 +51,7 @@ class check_mk::config ( } if ( $use_storedconfigs ) { class { 'check_mk::server::collect_hosts': } + class { 'check_mk::server::collect_ps': } } |