diff options
| author | elijah <elijah@riseup.net> | 2016-02-26 01:45:07 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-02-26 01:45:07 -0800 |
| commit | 15ca782e3bcd22f131c2b8745d7fad118b4b8648 (patch) | |
| tree | ab04c576d6024e2fce1490d00c86c4ba0ecced8e /puppet/modules/site_check_mk | |
| parent | 89a3cd71f50a383a5f85510193087446da0e661f (diff) | |
| parent | 0206d426bd51aa4805915f6e23b53d5fdb40d738 (diff) | |
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_check_mk')
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/agent.pp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp index 589041eb..8d8ab814 100644 --- a/puppet/modules/site_check_mk/manifests/agent.pp +++ b/puppet/modules/site_check_mk/manifests/agent.pp @@ -1,9 +1,14 @@ +# installs check-mk agent class site_check_mk::agent { $ssh_hash = hiera('ssh') $pubkey = $ssh_hash['authorized_keys']['monitor']['key'] $type = $ssh_hash['authorized_keys']['monitor']['type'] + + # /usr/bin/mk-job depends on /usr/bin/time + ensure_packages('time') + class { 'site_apt::preferences::check_mk': } -> class { 'check_mk::agent': @@ -11,7 +16,8 @@ class site_check_mk::agent { agent_logwatch_package_name => 'check-mk-agent-logwatch', method => 'ssh', homedir => '/etc/nagios/check_mk', - register_agent => false + register_agent => false, + require => Package['time'] } -> class { 'site_check_mk::agent::mrpe': } -> |