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

[Netflow live] Minor fixes 

Former-commit-id: 9778bf449513e3fad89f59f56f327e7afd154d96
This commit is contained in:
fermin831 2019-03-14 17:49:44 +01:00
parent b660da6e84
commit 6299d23528
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_graph.php
View File

@ -4166,6 +4166,8 @@ function graph_netflow_aggregate_area($data, $period, $width, $height, $ttl=1, $
'array_data_create' => $chart, 'array_data_create' => $chart,
'stacked' => 1, 'stacked' => 1,
'date' => $date, 'date' => $date,
'show_export_csv' => false,
'show_overview' => false,
]; ];
return grafico_modulo_sparse($params); return grafico_modulo_sparse($params);

10
pandora_console/include/functions_netflow.php
View File

@ -1131,7 +1131,15 @@ function netflow_draw_item($start_date, $end_date, $interval_length, $type, $fil
$html .= '&nbsp;<b>'._('Resolution').':</b> '.netflow_get_resolution_name($interval_length); $html .= '&nbsp;<b>'._('Resolution').':</b> '.netflow_get_resolution_name($interval_length);
} }
$html .= graph_netflow_aggregate_area($data, $interval, $width, $height, 1, false, $end_date); $html .= graph_netflow_aggregate_area(
$data,
$interval,
$width,
$height,
($output === 'HTML') ? 1 : 2,
($output === 'HTML'),
$end_date
);
return $html; return $html;
} else if ($output == 'XML') { } else if ($output == 'XML') {
$xml .= "<aggregate>$aggregate</aggregate>\n"; $xml .= "<aggregate>$aggregate</aggregate>\n";

2
pandora_console/operation/netflow/nf_live_view.php
View File

@ -449,7 +449,7 @@ if (is_metaconsole()) {
echo '<td><b>'.__('IP address resolution').'</b>'.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true).'</td>'; echo '<td><b>'.__('IP address resolution').'</b>'.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true).'</td>';
echo '<td colspan="2">'.$radio_buttons.'</td>'; echo '<td colspan="2">'.$radio_buttons.'</td>';
echo '<td><b>'.__('Router ip').'</b></td>'; echo '<td><b>'.__('Source ip').'</b></td>';
echo '<td colspan="2">'.html_print_input_text('router_ip', $filter['router_ip'], false, 40, 80, true).'</td>'; echo '<td colspan="2">'.html_print_input_text('router_ip', $filter['router_ip'], false, 40, 80, true).'</td>';
echo '</tr>'; echo '</tr>';