2014-07-18 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php, include/functions_reporting.php: fixed to show the unknown graph in simple graph. INCIDENT: #1035 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10343 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
50885d86d2
commit
e961f3dca9
|
@ -1,3 +1,10 @@
|
|||
2014-07-18 Miguel de Dios <miguel.dedios@artica.es>
|
||||
|
||||
* include/functions_graph.php, include/functions_reporting.php:
|
||||
fixed to show the unknown graph in simple graph.
|
||||
|
||||
INCIDENT: #1035
|
||||
|
||||
2014-07-17 Miguel de Dios <miguel.dedios@artica.es>
|
||||
|
||||
* include/auth/ldap.php, include/auth/mysql.php: fixed the
|
||||
|
|
|
@ -102,13 +102,14 @@ function get_statwin_graph_statistics ($chart_array, $series_suffix = '') {
|
|||
|
||||
foreach ($chart_array as $item) {
|
||||
if ($series_suffix != '') {
|
||||
$item['sum'] = $item['sum'.$series_suffix];
|
||||
$item['min'] = $item['min'.$series_suffix];
|
||||
$item['max'] = $item['max'.$series_suffix];
|
||||
$item['sum'] = $item['sum' . $series_suffix];
|
||||
$item['min'] = $item['min' . $series_suffix];
|
||||
$item['max'] = $item['max' . $series_suffix];
|
||||
}
|
||||
|
||||
//Get stats for normal graph
|
||||
if (isset($item['sum']) && $item['sum']) {
|
||||
|
||||
//Sum all values later divide by the number of elements
|
||||
$stats['sum']['avg'] = $stats['sum']['avg'] + $item['sum'];
|
||||
|
||||
|
@ -3257,7 +3258,7 @@ function graph_netflow_host_traffic ($data, $unit, $width = 700, $height = 700)
|
|||
* @param integer date date
|
||||
*/
|
||||
function grafico_modulo_string ($agent_module_id, $period, $show_events,
|
||||
$width, $height , $title, $unit_name, $show_alerts, $avg_only = 0, $pure=0,
|
||||
$width, $height , $title, $unit_name, $show_alerts, $avg_only = 0, $pure = 0,
|
||||
$date = 0, $only_image = false, $homeurl = '', $adapt_key = '', $ttl = 1, $menu = true) {
|
||||
global $config;
|
||||
global $graphic_type;
|
||||
|
@ -3417,7 +3418,7 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
|
|||
//The order in chart array is very important!!!!
|
||||
if ($show_events) {
|
||||
$chart[$timestamp]['event'] = $event_value;
|
||||
}
|
||||
}
|
||||
|
||||
if ($show_alerts) {
|
||||
$chart[$timestamp]['alert'] = $alert_value;
|
||||
|
|
|
@ -3123,9 +3123,29 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
|
|||
}
|
||||
else {
|
||||
|
||||
$data[0] = grafico_modulo_sparse($content['id_agent_module'], $content['period'],
|
||||
false, $sizgraph_w, $sizgraph_h, '', '', false, true, true,
|
||||
$report["datetime"], '', 0, 0, true, true, ui_get_full_url(false) . '/');
|
||||
$data[0] = grafico_modulo_sparse(
|
||||
$content['id_agent_module'],
|
||||
$content['period'],
|
||||
false,
|
||||
$sizgraph_w,
|
||||
$sizgraph_h,
|
||||
'',
|
||||
'',
|
||||
false,
|
||||
true,
|
||||
true,
|
||||
$report["datetime"],
|
||||
'',
|
||||
0,
|
||||
0,
|
||||
true,
|
||||
true,
|
||||
ui_get_full_url(false) . '/',
|
||||
1,
|
||||
false,
|
||||
'',
|
||||
false,
|
||||
true);
|
||||
}
|
||||
|
||||
array_push ($table->data, $data);
|
||||
|
|
Loading…
Reference in New Issue