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

Merge branch 'ent-4973-Numero-de-estados-muestras-en-Availability-graph' into 'develop' 

Fixed SLA error counter check

See merge request artica/pandorafms!3225
This commit is contained in:
Alejandro Fraguas 2020-06-19 10:05:41 +02:00
parent 9beb1ce22f db630a75db
commit 71c8451727
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pandora_console/include/functions_reporting.php
View File

@ -6147,7 +6147,13 @@ function reporting_advanced_sla(
$time_total += $time_interval;
if ($time_interval > 0) {
$total_checks++;
if (isset($current_data['type']) === false
|| ((int) $current_data['type'] === 0
&& $i !== 0)
) {
$total_checks++;
}
if ((isset($current_data['datos']))
&& ($current_data['datos'] !== false)
) {
@ -6159,7 +6165,7 @@ function reporting_advanced_sla(
$match = preg_match('/'.$max_value.'/', $current_data['datos']);
}
// Take notice of $inverse_interval value,
// Take notice of $inverse_interval value.
if ($inverse_interval == 0) {
$sla_check_value = $match;
} else {
@ -6176,19 +6182,41 @@ function reporting_advanced_sla(
// Not unknown nor not init values.
if ($sla_check_value) {
$ok_checks++;
if (isset($current_data['type']) === false
|| ((int) $current_data['type'] === 0
&& $i !== 0)
) {
$ok_checks++;
}
$time_in_ok += $time_interval;
} else {
$bad_checks++;
if (isset($current_data['type']) === false
|| ((int) $current_data['type'] === 0
&& $i !== 0)
) {
$bad_checks++;
}
$time_in_error += $time_interval;
}
} else {
if ($current_data['datos'] === null) {
$time_in_unknown += $time_interval;
$unknown_checks++;
if (isset($current_data['type']) === false
|| ((int) $current_data['type'] === 0
&& $i !== 0)
) {
$unknown_checks++;
}
} else if ($current_data['datos'] === false) {
$time_in_not_init += $time_interval;
$not_init_checks++;
if (isset($current_data['type']) === false
|| ((int) $current_data['type'] === 0
&& $i !== 0)
) {
$not_init_checks++;
}
}
}
}