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

Ent 5366 monitor report not showing correct sla

This commit is contained in:
Luis 2020-03-12 10:41:43 +01:00 committed by Daniel Rodriguez
parent 1a8539fe81
commit d9dd1992ff
1 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
pandora_console/include/functions_reporting.php
View File

@ -5664,22 +5664,32 @@ function reporting_advanced_sla(
// Infer availability range based on the critical thresholds. // Infer availability range based on the critical thresholds.
$agentmodule_info = modules_get_agentmodule($id_agent_module); $agentmodule_info = modules_get_agentmodule($id_agent_module);
// // Check if module type is string.
$is_string_module = modules_is_string($agentmodule_info['id_agente_modulo']);
// Take in mind: the "inverse" critical threshold. // Take in mind: the "inverse" critical threshold.
$min_value = $agentmodule_info['min_critical'];
$max_value = $agentmodule_info['max_critical'];
$inverse_interval = ($agentmodule_info['critical_inverse'] == 0) ? 1 : 0; $inverse_interval = ($agentmodule_info['critical_inverse'] == 0) ? 1 : 0;
if ((!isset($min_value)) || ($min_value == 0)) { if (!$is_string_module) {
$min_value = null; $min_value = $agentmodule_info['min_critical'];
$max_value = $agentmodule_info['max_critical'];
} else {
$max_value = io_safe_output($agentmodule_info['str_critical']);
} }
if ((!isset($max_value)) || ($max_value == 0)) { if (!$is_string_module) {
$max_value = null; if ((!isset($min_value)) || ($min_value == 0)) {
} $min_value = null;
}
if ((!(isset($max_value))) && (!(isset($min_value)))) { if ((!isset($max_value)) || ($max_value == 0)) {
$max_value = null; $max_value = null;
$min_value = null; }
if ((!(isset($max_value))) && (!(isset($min_value)))) {
$max_value = null;
$min_value = null;
}
} }
if ((!isset($min_value)) && (!isset($max_value))) { if ((!isset($min_value)) && (!isset($max_value))) {
@ -6141,14 +6151,31 @@ function reporting_advanced_sla(
if ((isset($current_data['datos'])) if ((isset($current_data['datos']))
&& ($current_data['datos'] !== false) && ($current_data['datos'] !== false)
) { ) {
// Check values if module is sring type.
if ($is_string_module) {
if (empty($max_value)) {
$match = preg_match('/^'.$max_value.'$/', $current_data['datos']);
} else {
$match = preg_match('/'.$max_value.'/', $current_data['datos']);
}
// Take notice of $inverse_interval value,
if ($inverse_interval == 0) {
$sla_check_value = $match;
} else {
$sla_check_value = !$match;
}
} else {
$sla_check_value = sla_check_value(
$current_data['datos'],
$min_value,
$max_value,
$inverse_interval
);
}
// Not unknown nor not init values. // Not unknown nor not init values.
if (sla_check_value( if ($sla_check_value) {
$current_data['datos'],
$min_value,
$max_value,
$inverse_interval
)
) {
$ok_checks++; $ok_checks++;
$time_in_ok += $time_interval; $time_in_ok += $time_interval;
} else { } else {