tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

2014-05-31 Junichi Satoh <junichi@rworks.jp>

Browse Source 
* lib/PandoraFMS/Core.pm: Improved 'FF threshold' to be able to define
	timeout.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10062 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2014-05-31 13:39:45 +00:00
parent f0ef84d6e8
commit 55c25d883f
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2014-05-31 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm: Improved 'FF threshold' to be able to define
timeout.
2014-05-30 Sancho Lerena <slerena@artica.es>
* conf/pandora_server.conf.new: Review of default configuration file.

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

@ -1063,6 +1063,7 @@ sub pandora_process_module ($$$$$$$$$;$) {
my $last_data_value = $agent_status->{'datos'};
my $last_known_status = $agent_status->{'last_known_status'};
my $last_error = defined ($module->{'last_error'}) ? $module->{'last_error'} : $agent_status->{'last_error'};
my $ff_start_utimestamp = $agent_status->{'ff_start_utimestamp'};
# Get new status
my $new_status = get_module_status ($processed_data, $module, $module_type);
@ -1082,6 +1083,7 @@ sub pandora_process_module ($$$$$$$$$;$) {
#Update module status
my $min_ff_event = $module->{'min_ff_event'};
my $current_utimestamp = time ();
my $ff_timeout = $module->{'ff_timeout'};
if ($module->{'each_ff'}) {
$min_ff_event = $module->{'min_ff_event_normal'} if ($new_status == 0);
@ -1095,9 +1097,14 @@ sub pandora_process_module ($$$$$$$$$;$) {
$status_changes = $min_ff_event if ($status_changes > $module->{'min_ff_event'});
$status_changes++;
if ($min_ff_event != 0 && $ff_timeout != 0 && ($utimestamp - $ff_start_utimestamp) > $ff_timeout) {
$status_changes = 0;
$ff_start_utimestamp = $utimestamp;
}
}
else {
$status_changes = 0;
$ff_start_utimestamp = $utimestamp;
}
# Active ff interval
@ -1148,10 +1155,11 @@ sub pandora_process_module ($$$$$$$$$;$) {
SET datos = ?, estado = ?, last_status = ?, last_known_status = ?,
status_changes = ?, utimestamp = ?, timestamp = ?,
id_agente = ?, current_interval = ?, running_by = ?,
last_execution_try = ?, last_try = ?, last_error = ?
last_execution_try = ?, last_try = ?, last_error = ?,
ff_start_utimestamp = ?
WHERE id_agente_modulo = ?', $processed_data, $status, $last_status, $last_status, $status_changes,
$current_utimestamp, $timestamp, $module->{'id_agente'}, $current_interval, $server_id,
$utimestamp, ($save == 1) ? $timestamp : $agent_status->{'last_try'}, $last_error, $module->{'id_agente_modulo'});
$utimestamp, ($save == 1) ? $timestamp : $agent_status->{'last_try'}, $last_error, $ff_start_utimestamp, $module->{'id_agente_modulo'});
# Save module data. Async and log4x modules are not compressed.
if ($module_type =~ m/(async)|(log4x)/ || $save == 1) {