From 0f34528f6f977573c2c722a70bde382f5dade905 Mon Sep 17 00:00:00 2001 From: Kike Date: Mon, 23 Dec 2019 17:28:40 +0100 Subject: [PATCH 1/2] Set default rcmd_timeout=10 and new rcmd_timeout_bin token --- pandora_server/conf/pandora_server.conf.new | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index fa9491ce14..11fed7ccee 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -164,7 +164,7 @@ network_timeout 4 # Network timeout (in seconds) for timeout in remote execution commands (PANDORA FMS ENTERPRISE ONLY). -rcmd_timeout 30 +rcmd_timeout 10 # Server keepalive (in seconds) diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 6b9d63b935..e743a5f4ba 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -275,7 +275,8 @@ sub pandora_load_config { $pa_config->{"alert_recovery"} = 0; # Introduced on 1.3.1 $pa_config->{"snmp_checks"} = 1; # Introduced on 1.3.1 $pa_config->{"snmp_timeout"} = 8; # Introduced on 1.3.1 - $pa_config->{"rcmd_timeout"} = 30; # Introduced on 7.0.740 + $pa_config->{"rcmd_timeout"} = 10; # Introduced on 7.0.740 + $pa_config->{"rcmd_timeout_bin"} = '/usr/bin/timeout'; # Introduced on 7.0.743 $pa_config->{"snmp_trapd"} = '/usr/sbin/snmptrapd'; # 3.0 $pa_config->{"tcp_checks"} = 1; # Introduced on 1.3.1 $pa_config->{"tcp_timeout"} = 20; # Introduced on 1.3.1 @@ -803,6 +804,9 @@ sub pandora_load_config { elsif ($parametro =~ m/^rcmd_timeout\s+([0-9]*)/i) { $pa_config->{"rcmd_timeout"} = clean_blank($1); } + elsif ($parametro =~ m/^rcmd_timeout_bin\s(.*)/i) { + $pa_config->{"rcmd_timeout_bin"} = clean_blank($1); + } elsif ($parametro =~ m/^tcp_checks\s+([0-9]*)/i) { $pa_config->{"tcp_checks"} = clean_blank($1); } From 79d3cd613f668b7902bca44ee43fcb409e271441 Mon Sep 17 00:00:00 2001 From: Kike Date: Tue, 24 Dec 2019 10:43:08 +0100 Subject: [PATCH 2/2] Added rcmd_timeout_bin token in pandora_server.conf by default --- pandora_server/conf/pandora_server.conf.new | 4 ++++ pandora_server/conf/pandora_server.conf.windows | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 11fed7ccee..7d8efd1674 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -166,6 +166,10 @@ network_timeout 4 rcmd_timeout 10 +# Pandora FMS remote execution commands timeout tool filepath (by default at /usr/bin) + +rcmd_timeout_bin /usr/bin/timeout + # Server keepalive (in seconds) server_keepalive 45 diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows index a7232e459c..44a36abad9 100644 --- a/pandora_server/conf/pandora_server.conf.windows +++ b/pandora_server/conf/pandora_server.conf.windows @@ -148,6 +148,14 @@ wmiserver 0 network_timeout 5 +# Network timeout (in seconds) for timeout in remote execution commands (PANDORA FMS ENTERPRISE ONLY). + +rcmd_timeout 10 + +# Pandora FMS remote execution commands timeout tool filepath (by default at /usr/bin) + +rcmd_timeout_bin C:\PandoraFMS\Pandora_Server\bin\pandora_exec.exe + # Server keepalive (in seconds) server_keepalive 45