diff options
| author | varac <varacanero@zeromail.org> | 2014-03-04 18:59:47 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-03-04 18:59:47 +0100 |
| commit | dfe2800b2264b4f2088d488d718ce72e39d2d15f (patch) | |
| tree | 4792721b97f95e45eb8a7041901a157b8fe473da /puppet/modules/site_check_mk/manifests/agent | |
| parent | 468064d2346519eeda7638a185ff5fa6b53d5eb4 (diff) | |
| parent | 3b7c8e273a0e75e58c736b2eacf89b4c7b9d81e5 (diff) | |
Merge branch 'improve_monitoring_even_more' into 0.6
Diffstat (limited to 'puppet/modules/site_check_mk/manifests/agent')
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/agent/logwatch.pp | 6 | ||||
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/agent/mrpe.pp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp index 38514af2..4c249e6f 100644 --- a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp +++ b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp @@ -4,8 +4,9 @@ class site_check_mk::agent::logwatch { # see https://leap.se/code/issues/5135 file { '/usr/lib/check_mk_agent/plugins/mk_logwatch': - source => 'puppet:///modules/site_check_mk/agent/plugins/mk_logwatch.1.2.4', - mode => '0755' + source => 'puppet:///modules/site_check_mk/agent/plugins/mk_logwatch.1.2.4', + mode => '0755', + require => Package['check-mk-agent'] } # only config files that watch a distinct logfile should go in logwatch.d/ @@ -13,6 +14,7 @@ class site_check_mk::agent::logwatch { ensure => directory, recurse => true, purge => true, + require => Package['check-mk-server'] } # service that share a common logfile (i.e. /var/log/syslog) need to get diff --git a/puppet/modules/site_check_mk/manifests/agent/mrpe.pp b/puppet/modules/site_check_mk/manifests/agent/mrpe.pp index 37df7f74..7222e4e1 100644 --- a/puppet/modules/site_check_mk/manifests/agent/mrpe.pp +++ b/puppet/modules/site_check_mk/manifests/agent/mrpe.pp @@ -8,7 +8,8 @@ class site_check_mk::agent::mrpe { } file { '/etc/check_mk/mrpe.cfg': - ensure => present + ensure => present, + require => Package['check-mk-server'] } -> file_line { 'Apt': line => 'APT /usr/lib/nagios/plugins/check_apt', |