diff options
| author | varac <varacanero@zeromail.org> | 2014-02-24 13:45:50 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-27 18:12:15 +0100 |
| commit | 2b875d23a3d2a53c9276dfee1a71085967dec4c0 (patch) | |
| tree | a05f6f418e0a347a46d7593aef66fab88aa95bb7 /puppet/modules/site_check_mk | |
| parent | f8e01ef3c5cc725a685f03869d8d821176181baa (diff) | |
One monitor node for non-local environments and one for local environment (Feature #2981), wip
also, use the configured ssh port for every node
Diffstat (limited to 'puppet/modules/site_check_mk')
| -rw-r--r-- | puppet/modules/site_check_mk/manifests/server.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/site_check_mk/templates/use_ssh.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp index e77862e5..4bbeb850 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': diff --git a/puppet/modules/site_check_mk/templates/use_ssh.mk b/puppet/modules/site_check_mk/templates/use_ssh.mk index 4c5523db..0bebebcf 100644 --- a/puppet/modules/site_check_mk/templates/use_ssh.mk +++ b/puppet/modules/site_check_mk/templates/use_ssh.mk @@ -1,5 +1,6 @@ # http://mathias-kettner.de/checkmk_datasource_programs.html datasource_programs = [ - ( "ssh -l root -i /etc/check_mk/.ssh/id_rsa -p <%= @ssh_port %> <HOST> check_mk_agent", ALL_HOSTS ), -] +<% nagios_hosts.sort.each do |name,config| %> + ( "ssh -l root -i /etc/check_mk/.ssh/id_rsa -p <%=config['ssh_port']%> <%=config['domain_internal']%> check_mk_agent", [ "<%=config['domain_internal']%>" ], ),<%- end -%> +] |