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

Add support for percentage module status thresholds.

This commit is contained in:
Ramon Novoa 2021-11-25 12:58:21 +01:00
parent 5464a73a12
commit 5bf83bcc81
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1945,7 +1945,7 @@ sub pandora_process_module ($$$$$$$$$;$) {
}
# Get new status
my $new_status = get_module_status ($processed_data, $module, $module_type);
my $new_status = get_module_status ($processed_data, $module, $module_type, $last_data_value);
my $last_status_change = $agent_status->{'last_status_change'};
# Set the last status change macro. Even if its value changes later, whe want the original value.
@ -4793,8 +4793,8 @@ sub log4x_get_severity_num($) {
##########################################################################
# Returns the status of the module: 0 (NORMAL), 1 (CRITICAL), 2 (WARNING).
##########################################################################
sub get_module_status ($$$) {
my ($data, $module, $module_type) = @_;
sub get_module_status ($$$$) {
my ($data, $module, $module_type, $last_data_value) = @_;
my ($critical_min, $critical_max, $warning_min, $warning_max) =
($module->{'min_critical'}, $module->{'max_critical'}, $module->{'min_warning'}, $module->{'max_warning'});
my ($critical_str, $warning_str) = ($module->{'str_critical'}, $module->{'str_warning'});
@ -4811,6 +4811,42 @@ sub get_module_status ($$$) {
$critical_str = (defined ($critical_str) && valid_regex ($critical_str) == 1) ? safe_output($critical_str) : '';
$warning_str = (defined ($warning_str) && valid_regex ($warning_str) == 1) ? safe_output($warning_str) : '';
# Adjust percentage max/min values.
if ($module->{'percentage_critical'} == 1) {
if ($critical_max != 0 && $critical_min != 0) {
$critical_max = $last_data_value * (1 + $critical_max / 100.0);
$critical_min = $last_data_value * (1 - $critical_min / 100.0);
$module->{'critical_inverse'} = 1;
}
elsif ($critical_min != 0) {
$critical_max = $last_data_value * (1 - $critical_min / 100.0);
$critical_min = 0;
$module->{'critical_inverse'} = 0;
}
elsif ($critical_max != 0) {
$critical_min = $last_data_value * (1 + $critical_max / 100.0);
$critical_max = 0;
$module->{'critical_inverse'} = 0;
}
}
if ($module->{'percentage_warning'} == 1) {
if ($warning_max != 0 && $warning_min != 0) {
$warning_max = $last_data_value * (1 + $warning_max / 100.0);
$warning_min = $last_data_value * (1 - $warning_min / 100.0);
$module->{'warning_inverse'} = 1;
}
elsif ($warning_min != 0) {
$warning_max = $last_data_value * (1 - $warning_min / 100.0);
$warning_min = 0;
$module->{'warning_inverse'} = 0;
}
elsif ($warning_max != 0) {
$warning_min = $last_data_value * (1 + $warning_max / 100.0);
$warning_max = 0;
$module->{'warning_inverse'} = 0;
}
}
if (($module_type =~ m/_proc$/ || $module_type =~ /web_analysis/) && ($critical_min eq $critical_max)) {
($critical_min, $critical_max) = (0, 1);
}