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

Fixed last value on general template reports and individual reports

This commit is contained in:
fermin831 2017-10-06 15:45:40 +02:00
parent 1008912e94
commit 4530f2213c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/functions_reporting.php
View File

@ -131,7 +131,9 @@ function reporting_make_reporting_data($report = null, $id_report,
foreach ($contents as $content) { foreach ($contents as $content) {
$server_name = $content['server_name']; $server_name = $content['server_name'];
if (!empty($period)) { // General reports with 0 period means last value
// Avoid to overwrite it by template value
if (!empty($period) && ($content['type'] !== 'general' && $content['period'] != 0)) {
$content['period'] = $period; $content['period'] = $period;
} }
@ -5623,6 +5625,7 @@ function reporting_general($report, $content) {
$i = 0; $i = 0;
$index = 0; $index = 0;
$is_string = array();
foreach ($generals as $row) { foreach ($generals as $row) {
//Metaconsole connection //Metaconsole connection
$server_name = $row ['server_name']; $server_name = $row ['server_name'];
@ -5648,6 +5651,7 @@ function reporting_general($report, $content) {
$mod_name = modules_get_agentmodule_name ($row['id_agent_module']); $mod_name = modules_get_agentmodule_name ($row['id_agent_module']);
$ag_name = modules_get_agentmodule_agent_alias ($row['id_agent_module']); $ag_name = modules_get_agentmodule_agent_alias ($row['id_agent_module']);
$type_mod = modules_get_last_value($row['id_agent_module']); $type_mod = modules_get_last_value($row['id_agent_module']);
$is_string[$index] = modules_is_string($row['id_agent_module']);
$unit = db_get_value('unit', 'tagente_modulo', $unit = db_get_value('unit', 'tagente_modulo',
'id_agente_modulo', 'id_agente_modulo',
$row['id_agent_module']); $row['id_agent_module']);
@ -5657,7 +5661,7 @@ function reporting_general($report, $content) {
modules_get_last_value($row['id_agent_module']); modules_get_last_value($row['id_agent_module']);
} }
else { else {
if(is_numeric($type_mod)){ if(is_numeric($type_mod) && !$is_string[$index]) {
switch ($row['operation']) { switch ($row['operation']) {
case 'sum': case 'sum':
$data_res[$index] = $data_res[$index] =
@ -5711,7 +5715,7 @@ function reporting_general($report, $content) {
} }
// Calculate the avg, min and max // Calculate the avg, min and max
if (is_numeric($data_res[$index])) { if (is_numeric($data_res[$index]) && !$is_string[$index]) {
$change_min = false; $change_min = false;
if (is_null($return["min"]["value"])) { if (is_null($return["min"]["value"])) {
$change_min = true; $change_min = true;
@ -5837,7 +5841,7 @@ function reporting_general($report, $content) {
break; break;
} }
if (!is_numeric($d)) { if (!is_numeric($d) || $is_string[$i]) {
$data['value'] = $d; $data['value'] = $d;
// to see the chains on the table // to see the chains on the table
$data['formated_value'] = $d; $data['formated_value'] = $d;