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

fixed bug in custom report's summatory

This commit is contained in:
alejandro-campos 2018-12-04 11:55:52 +01:00
parent 4b1649d5f8
commit ef28abc460
1 changed files with 27 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
pandora_console/include/functions_reporting.php
View File

@ -9308,46 +9308,13 @@ function reporting_get_agentmodule_data_sum ($id_agent_module,
// Incremental modules are treated differently // Incremental modules are treated differently
$module_inc = is_module_inc ($module_name); $module_inc = is_module_inc ($module_name);
// Get module data if (!$uncompressed_module)
$interval_data = db_get_all_rows_sql(' $interval_data = db_uncompress_module_data((int) $id_agent_module, (int) $datelimit, (int) $date);
SELECT * FROM tagente_datos
WHERE id_agente_modulo = ' . (int) $id_agent_module . '
AND utimestamp > ' . (int) $datelimit . '
AND utimestamp < ' . (int) $date . '
ORDER BY utimestamp ASC', $search_in_history_db);
if ($interval_data === false) $interval_data = array (); if ($interval_data === false) $interval_data = array ();
// Uncompressed module data $min_necessary = 1;
if ($uncompressed_module) {
$min_necessary = 1;
// Compressed module data
}
else {
// Get previous data
$previous_data = modules_get_previous_data ($id_agent_module, $datelimit);
if ($previous_data !== false) {
$previous_data['utimestamp'] = $datelimit;
array_unshift ($interval_data, $previous_data);
}
// Get next data
$next_data = modules_get_next_data ($id_agent_module, $date);
if ($next_data !== false) {
$next_data['utimestamp'] = $date;
array_push ($interval_data, $next_data);
}
else if (count ($interval_data) > 0) {
// Propagate the last known data to the end of the interval
$next_data = array_pop ($interval_data);
array_push ($interval_data, $next_data);
$next_data['utimestamp'] = $date;
array_push ($interval_data, $next_data);
}
$min_necessary = 2;
}
if (count ($interval_data) < $min_necessary) { if (count ($interval_data) < $min_necessary) {
return false; return false;
@ -9355,11 +9322,14 @@ function reporting_get_agentmodule_data_sum ($id_agent_module,
// Set initial conditions // Set initial conditions
$total = 0; $total = 0;
if (! $uncompressed_module) { $partial_total = 0;
$previous_data = array_shift ($interval_data); $count_sum = 0;
}
foreach ($interval_data as $data) { foreach ($interval_data as $data) {
$partial_total = 0;
$count_sum = 0;
switch ($config["dbtype"]) { switch ($config["dbtype"]) {
case "mysql": case "mysql":
case "postgresql": case "postgresql":
@ -9370,18 +9340,25 @@ function reporting_get_agentmodule_data_sum ($id_agent_module,
oracle_format_float_to_php($data['datos']); oracle_format_float_to_php($data['datos']);
break; break;
} }
if ($uncompressed_module) { if (!$module_inc) {
$total += $data['datos']; foreach ($data['data'] as $val) {
} if (is_numeric($val['datos'])) {
else if ($module_inc) { $partial_total += $val['datos'];
$total += $previous_data['datos'] * ($data['utimestamp'] - $previous_data['utimestamp']); $count_sum++;
}
}
if ($count_sum===0) continue;
$total += $partial_total/$count_sum;
} }
else { else {
$total += $previous_data['datos'] * ($data['utimestamp'] - $previous_data['utimestamp']) / $module_interval; $last = end($data['data']);
$total += $last['datos'];
} }
$previous_data = $data;
} }
return $total; return $total;
} }