diff options
| author | Varac <varac@leap.se> | 2016-06-01 08:27:23 +0000 |
|---|---|---|
| committer | Varac <varac@leap.se> | 2016-06-01 08:27:23 +0000 |
| commit | 03c3ad24e1017c1684b62bcbf973153d9604ebe7 (patch) | |
| tree | 468ed9eb9cbea90883df30fa8da2a314c73c7c64 | |
| parent | 66b4c6b5ec6fe2f242020845fe92715ae2cdcc1e (diff) | |
| parent | 4d92b3a758e16fa2c7ee34a06272bd64a5c038ad (diff) | |
Merge branch 'timeout_7807' into '0.8.x'
Reduce check_mk timeouts (#7807).
check_mk operations can take a long time (such as when doing a
re-inventory using "check_mk -II") when multiple hosts are down. This
decreases the connect timeout to 5 seconds.
Change-Id: I1eac5f14bad2afc2ffc4cbf8c950c24b052a0d6e
See merge request !2
| -rw-r--r-- | puppet/modules/site_check_mk/templates/use_ssh.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_check_mk/templates/use_ssh.mk b/puppet/modules/site_check_mk/templates/use_ssh.mk index 55269536..25f951e0 100644 --- a/puppet/modules/site_check_mk/templates/use_ssh.mk +++ b/puppet/modules/site_check_mk/templates/use_ssh.mk @@ -1,6 +1,6 @@ # http://mathias-kettner.de/checkmk_datasource_programs.html datasource_programs = [ <% @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 -%> + ( "ssh -o ConnectTimeout=5 -l root -i /etc/check_mk/.ssh/id_rsa -p <%=config['ssh_port']%> <%=config['domain_internal']%> check_mk_agent", [ "<%=config['domain_internal']%>" ], ),<%- end -%> ] |