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

Add "defined" validations to get_module_status if

This commit is contained in:
Félix Suárez 2023-05-26 15:18:21 -06:00
parent 9f542a42f0
commit bb1f67c960
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5199,7 +5199,7 @@ sub get_module_status ($$$$) {
$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 (defined($module->{'percentage_critical'}) && $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);
@ -5216,7 +5216,7 @@ sub get_module_status ($$$$) {
$module->{'critical_inverse'} = 0;
}
}
if ($module->{'percentage_warning'} == 1) {
if (defined($module->{'percentage_warning'}) && $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);
@ -5255,7 +5255,7 @@ sub get_module_status ($$$$) {
# Critical
if ($critical_min ne $critical_max) {
# [critical_min, critical_max)
if ($module->{'critical_inverse'} == 0) {
if (defined($module->{'critical_inverse'}) && $module->{'critical_inverse'} == 0) {
return 1 if ($data >= $critical_min && $data < $critical_max);
return 1 if ($data >= $critical_min && $critical_max < $critical_min);
}
@ -5272,7 +5272,7 @@ sub get_module_status ($$$$) {
# Warning
if ($warning_min ne $warning_max) {
# [warning_min, warning_max)
if ($module->{'warning_inverse'} == 0) {
if (defined($module->{'warning_inverse'}) && $module->{'warning_inverse'} == 0) {
return 2 if ($data >= $warning_min && $data < $warning_max);
return 2 if ($data >= $warning_min && $warning_max < $warning_min);
}
@ -5291,7 +5291,7 @@ sub get_module_status ($$$$) {
# Critical
$eval_result = eval {
if ($module->{'critical_inverse'} == 0) {
if (defined($module->{'critical_inverse'}) && $module->{'critical_inverse'} == 0) {
$critical_str ne '' && $data =~ /$critical_str/ ;
} else {
$critical_str ne '' && $data !~ /$critical_str/ ;
@ -5301,7 +5301,7 @@ sub get_module_status ($$$$) {
# Warning
$eval_result = eval {
if ($module->{'warning_inverse'} == 0) {
if (defined($module->{'warning_inverse'}) && $module->{'warning_inverse'} == 0) {
$warning_str ne '' && $data =~ /$warning_str/ ;
} else {
$warning_str ne '' && $data !~ /$warning_str/ ;