diff options
| author | varac <varacanero@zeromail.org> | 2014-02-27 22:43:23 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-27 22:43:23 +0100 |
| commit | 0cd0076f945c0e02bfdc50ff483ceebceec131e2 (patch) | |
| tree | 21c631e5bdee5e3019c7fbe4dfac1b04ef325599 /puppet/modules/site_check_mk/manifests/server.pp | |
| parent | e8cd9ab2d4480aa7c16d15f5db664fa650d4c655 (diff) | |
| parent | 66cc1345c3af4e814d98c8e4b90d90158ac9d399 (diff) | |
Merge branch 'one_monitornode_rules_them_all' into 0.6
Diffstat (limited to 'puppet/modules/site_check_mk/manifests/server.pp')
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/server.pp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp index e77862e5..0c98cd5a 100644 --- a/puppet/modules/site_check_mk/manifests/server.pp +++ b/puppet/modules/site_check_mk/manifests/server.pp @@ -4,10 +4,11 @@ class site_check_mk::server { $pubkey = $ssh_hash['authorized_keys']['monitor']['key'] $type = $ssh_hash['authorized_keys']['monitor']['type'] $seckey = $ssh_hash['monitor']['private_key'] - $ssh_port = $ssh_hash['port'] $nagios_hiera = hiera_hash('nagios') - $hosts = $nagios_hiera['hosts'] + $nagios_hosts = $nagios_hiera['hosts'] + + $hosts = hiera_hash('hosts') $all_hosts = inline_template ('<% @hosts.keys.sort.each do |key| -%>"<%= @hosts[key]["domain_internal"] %>", <% end -%>') package { 'check-mk-server': @@ -43,6 +44,13 @@ class site_check_mk::server { content => "${type} ${pubkey} monitor", owner => 'nagios', mode => '0644'; + # check_icmp must be suid root or called by sudo + # see https://leap.se/code/issues/5171 + '/usr/lib/nagios/plugins/check_icmp': + mode => '4755', + require => Package['nagios-plugins-basic']; } + + include check_mk::agent::local_checks } |