[Netflow live] Minor fixes
Former-commit-id: 9778bf449513e3fad89f59f56f327e7afd154d96
This commit is contained in:
parent
b660da6e84
commit
6299d23528
|
@ -4166,6 +4166,8 @@ function graph_netflow_aggregate_area($data, $period, $width, $height, $ttl=1, $
|
|||
'array_data_create' => $chart,
|
||||
'stacked' => 1,
|
||||
'date' => $date,
|
||||
'show_export_csv' => false,
|
||||
'show_overview' => false,
|
||||
];
|
||||
|
||||
return grafico_modulo_sparse($params);
|
||||
|
|
|
@ -1131,7 +1131,15 @@ function netflow_draw_item($start_date, $end_date, $interval_length, $type, $fil
|
|||
$html .= ' <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;
|
||||
} else if ($output == 'XML') {
|
||||
$xml .= "<aggregate>$aggregate</aggregate>\n";
|
||||
|
|
|
@ -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 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 '</tr>';
|
||||
|
|
Loading…
Reference in New Issue