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

Added the return simple graph as data (for CSV reports) and the agent and module name.

This commit is contained in:
mdtrooper 2015-12-28 14:10:44 +01:00
parent 0694a02ab6
commit b5c98afdce
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/functions_reporting.php
View File

@ -112,6 +112,7 @@ function reporting_make_reporting_data($report = null, $id_report,
$contents = db_get_all_rows_field_filter ('treport_content',
'id_report', $id_report, db_escape_key_identifier('order'));
}
$datetime = strtotime($date . ' ' . $time);
$report["datetime"] = $datetime;
$report["group"] = $report['id_group'];
@ -4294,6 +4295,8 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
$return['title'] = $content['name'];
$return['subtitle'] = $agent_name . " - " . $module_name;
$return['agent_name'] = $agent_name;
$return['module_name'] = $module_name;
$return["description"] = $content["description"];
$return["date"] = reporting_get_date_text(
$report,
@ -4383,6 +4386,15 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
}
break;
case 'data':
$data = modules_get_agentmodule_data(
$content['id_agent_module'],
$content['period'],
$report["datetime"]);
foreach ($data as $d) {
$return['chart'][$d['utimestamp']] = $d['data'];
}
break;
}