From b5a61c8d1243ba92013b9668bb1ca6858a01582b Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 1 Mar 2017 14:58:03 +0100 Subject: [PATCH 1/2] Permission changed agent and tarball installers --- pandora_agents/unix/pandora_agent | 0 pandora_agents/unix/pandora_agent_installer | 0 pandora_server/pandora_server_installer | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 pandora_agents/unix/pandora_agent mode change 100644 => 100755 pandora_agents/unix/pandora_agent_installer mode change 100644 => 100755 pandora_server/pandora_server_installer diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent old mode 100644 new mode 100755 diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer old mode 100644 new mode 100755 diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer old mode 100644 new mode 100755 From ac3f45e5d33ce022bf6f18d9c3a8c1d745ac2c1e Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Wed, 1 Mar 2017 14:58:20 +0100 Subject: [PATCH 2/2] Add the dynamic_updates configuration option with examples. --- pandora_server/conf/pandora_server.conf.new | 4 ++++ pandora_server/conf/pandora_server.conf.windows | 4 ++++ pandora_server/lib/PandoraFMS/Config.pm | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 464bd5aec6..a9909034c8 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -548,3 +548,7 @@ warmup_unknown_interval 300 # Directory were additional enc files for the XML parser are located. enc_dir /usr/share/pandora_server/enc/ +# The number of times dynamic_min and dynamic_max will be recalculated per dynamic_interval. +# Go to http://wiki.pandorafms.com/ for more information. +dynamic_updates 5 + diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows index c6408ae903..3caa9beb00 100644 --- a/pandora_server/conf/pandora_server.conf.windows +++ b/pandora_server/conf/pandora_server.conf.windows @@ -522,3 +522,7 @@ warmup_unknown_interval 300 # Directory were additional enc files for the XML parser are located. enc_dir /usr/share/pandora_server/enc/ +# The number of times dynamic_min and dynamic_max will be recalculated per dynamic_interval. +# Go to http://wiki.pandorafms.com/ for more information. +dynamic_updates 5 + diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 94cdfc36cf..a2d0a3ca64 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -281,6 +281,7 @@ sub pandora_load_config { $pa_config->{"sync_port"} = '41121'; # 7.0 $pa_config->{"sync_retries"} = 2; # 7.0 $pa_config->{"sync_timeout"} = 5; # 7.0 + $pa_config->{"dynamic_updates"} = 5; # 7.0 # Internal MTA for alerts, each server need its own config. $pa_config->{"mta_address"} = '127.0.0.1'; # Introduced on 2.0 @@ -1008,6 +1009,9 @@ sub pandora_load_config { elsif ($parametro =~ m/^sync_retries\s+([0-9]*)/i) { $pa_config->{'sync_retries'}= clean_blank($1); } + elsif ($parametro =~ m/^dynamic_updates\s+([0-9]*)/i) { + $pa_config->{'dynamic_updates'}= clean_blank($1); + } } # end of loop for parameter # # Set to RDBMS' standard port