tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop

Browse Source
This commit is contained in:
daniel 2017-03-01 15:00:28 +01:00
commit 2891b36cb3
6 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pandora_agents/unix/pandora_agent Normal file → Executable file
View File

0
pandora_agents/unix/pandora_agent_installer Normal file → Executable file
View File

4
pandora_server/conf/pandora_server.conf.new
View File

@ -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

4
pandora_server/conf/pandora_server.conf.windows
View File

@ -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

4
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -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

0
pandora_server/pandora_server_installer Normal file → Executable file
View File