tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-10329-limitar-el-numero-de-modulos-unknown-que-se-procesan-en-cada-iteracion' into 'develop' 

Limit the number of unknown modules processed per iteration.

See merge request artica/pandorafms!5521
This commit is contained in:
Diego Muñoz-Reja 2023-02-08 14:48:58 +00:00
parent f845cc9478 b12b3c2a2c
commit 7e157b57de
3 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/conf/pandora_server.conf.new
View File

@ -598,6 +598,9 @@ unknown_events 1
# Time interval (as a multiple of the module interval) before a module becomes unknown. Twice the module's interval by default.
#unknown_interval 2
# Number of unknown modules that will be processed per iteration.
unknown_block_size 1000
# Maximum executing time of an alert (in seconds)
global_alert_timeout 15
@ -732,4 +735,4 @@ tentacle_service_watchdog 1
# Enable (1) or disable (0) the parameter of mysql ssl certification (mysql_ssl_verify_server_cert) (enabled by default).
verify_mysql_ssl_cert 1
verify_mysql_ssl_cert 1

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

@ -527,33 +527,35 @@ sub pandora_load_config {
$pa_config->{"unknown_updates"} = 0; # 7.0.718
$pa_config->{"provisioningserver"} = 1; # 7.0 720
$pa_config->{"provisioningserver_threads"} = 1; # 7.0 720
$pa_config->{"provisioning_cache_interval"} = 300; # 7.0 720
$pa_config->{"provisioningserver"} = 1; # 7.0.720
$pa_config->{"provisioningserver_threads"} = 1; # 7.0.720
$pa_config->{"provisioning_cache_interval"} = 300; # 7.0.720
$pa_config->{"autoconfigure_agents"} = 1; # 7.0 725
$pa_config->{"autoconfigure_agents_threshold"} = 300; #7.0 764
$pa_config->{"autoconfigure_agents"} = 1; # 7.0.725
$pa_config->{"autoconfigure_agents_threshold"} = 300; #7.0.764
$pa_config->{'snmp_extlog'} = ""; # 7.0 726
$pa_config->{'snmp_extlog'} = ""; # 7.0.726
$pa_config->{"fsnmp"} = "/usr/bin/pandorafsnmp"; # 7.0 732
$pa_config->{"fsnmp"} = "/usr/bin/pandorafsnmp"; # 7.0.732
$pa_config->{"event_inhibit_alerts"} = 0; # 7.0 737
$pa_config->{"event_inhibit_alerts"} = 0; # 7.0.737
$pa_config->{"alertserver"} = 0; # 7.0 756
$pa_config->{"alertserver_threads"} = 1; # 7.0 756
$pa_config->{"alertserver_warn"} = 180; # 7.0 756
$pa_config->{"alertserver_queue"} = 0; # 7.0 764
$pa_config->{"alertserver"} = 0; # 7.0.756
$pa_config->{"alertserver_threads"} = 1; # 7.0.756
$pa_config->{"alertserver_warn"} = 180; # 7.0.756
$pa_config->{"alertserver_queue"} = 0; # 7.0.764
$pa_config->{'ncmserver'} = 0; # 7.0 758
$pa_config->{'ncmserver_threads'} = 1; # 7.0 758
$pa_config->{'ncm_ssh_utility'} = '/usr/share/pandora_server/util/ncm_ssh_extension'; # 7.0 758
$pa_config->{'ncmserver'} = 0; # 7.0.758
$pa_config->{'ncmserver_threads'} = 1; # 7.0.758
$pa_config->{'ncm_ssh_utility'} = '/usr/share/pandora_server/util/ncm_ssh_extension'; # 7.0.758
$pa_config->{"pandora_service_cmd"} = 'service pandora_server'; # 7.0 761
$pa_config->{"tentacle_service_cmd"} = 'service tentacle_serverd'; # 7.0 761
$pa_config->{"tentacle_service_watchdog"} = 1; # 7.0 761
$pa_config->{"pandora_service_cmd"} = 'service pandora_server'; # 7.0.761
$pa_config->{"tentacle_service_cmd"} = 'service tentacle_serverd'; # 7.0.761
$pa_config->{"tentacle_service_watchdog"} = 1; # 7.0.761
$pa_config->{"dataserver_smart_queue"} = 0; # 765.
$pa_config->{"dataserver_smart_queue"} = 0; # 7.0.765
$pa_config->{"unknown_block_size"} = 1000; # 7.0.769
# Check for UID0
if ($pa_config->{"quiet"} != 0){

2
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -6203,7 +6203,7 @@ sub pandora_module_unknown ($$) {
')
)
AND tagente_estado.utimestamp != 0
AND (tagente_estado.current_interval * ?) + tagente_estado.utimestamp < UNIX_TIMESTAMP()', $pa_config->{'unknown_interval'});
AND (tagente_estado.current_interval * ?) + tagente_estado.utimestamp < UNIX_TIMESTAMP() LIMIT ?', $pa_config->{'unknown_interval'}, $pa_config->{'unknown_block_size'});
foreach my $module (@modules) {