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

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

* lib/PandoraFMS/Core.pm: Improved 'FF threshold' to be able to define
	each state changing.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9974 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2014-05-21 08:28:50 +00:00
parent dd54757bd4
commit 15870d4550
2 changed files with 17 additions and 4 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-21 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm: Improved 'FF threshold' to be able to define
each state changing.
2014-05-20 Ramon Novoa <rnovoa@artica.es> 2014-05-20 Ramon Novoa <rnovoa@artica.es>
* bin/pandora_server: Stop the service when the server crashes (win32). * bin/pandora_server: Stop the service when the server crashes (win32).

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

@ -1080,11 +1080,19 @@ sub pandora_process_module ($$$$$$$$$;$) {
} }
#Update module status #Update module status
my $min_ff_event = $module->{'min_ff_event'};
my $current_utimestamp = time (); my $current_utimestamp = time ();
if ($module->{'each_ff'}) {
$min_ff_event = $module->{'min_ff_event_normal'} if ($new_status == 0);
$min_ff_event = $module->{'min_ff_event_critical'} if ($new_status == 1);
$min_ff_event = $module->{'min_ff_event_warning'} if ($new_status == 2);
}
if ($last_status == $new_status) { if ($last_status == $new_status) {
# Avoid overflows # Avoid overflows
$status_changes = $module->{'min_ff_event'} if ($status_changes > $module->{'min_ff_event'}); $status_changes = $min_ff_event if ($status_changes > $module->{'min_ff_event'});
$status_changes++; $status_changes++;
} }
@ -1093,12 +1101,12 @@ sub pandora_process_module ($$$$$$$$$;$) {
} }
# Active ff interval # Active ff interval
if ($module->{'module_ff_interval'} != 0 && $status_changes < $module->{'min_ff_event'}) { if ($module->{'module_ff_interval'} != 0 && $status_changes < $min_ff_event) {
$current_interval = $module->{'module_ff_interval'}; $current_interval = $module->{'module_ff_interval'};
} }
# Change status # Change status
if ($status_changes == $module->{'min_ff_event'} && $status != $new_status) { if ($status_changes == $min_ff_event && $status != $new_status) {
generate_status_event ($pa_config, $processed_data, $agent, $module, $new_status, $status, $last_known_status, $dbh); generate_status_event ($pa_config, $processed_data, $agent, $module, $new_status, $status, $last_known_status, $dbh);
$status = $new_status; $status = $new_status;