diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index 04b10b4712..f60f476e17 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -1876,6 +1876,7 @@ function netflow_check_nfdump_binary($nfdump_binary) * @param integer $start_date In utimestamp. * @param integer $end_date In utimestamp. * @param string $filter Ip to filter. + * @param string $order Select one of bytes,pkts,flow. * * @return array With data (host, sum_bytes, sum_pkts and sum_flows). */ @@ -1884,7 +1885,8 @@ function netflow_get_top_summary( $top_action, $start_date, $end_date, - $filter='' + $filter='', + $order='bytes' ) { global $nfdump_date_format; $netflow_filter = []; @@ -1929,7 +1931,23 @@ function netflow_get_top_summary( $command = netflow_get_command($netflow_filter); // Execute nfdump. - $command .= " -o csv -n $max -s $sort/bytes -t ".date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + $order_text = ''; + switch ($order) { + case 'flows': + $order_text = 'flows'; + break; + + case 'pkts': + $order_text = 'packets'; + break; + + case 'bytes': + default: + $order_text = 'bytes'; + break; + } + + $command .= " -o csv -n $max -s $sort/$order_text -t ".date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); exec($command, $result); if (! is_array($result)) { diff --git a/pandora_console/operation/network/network_report.php b/pandora_console/operation/network/network_report.php index e4dd539c8e..bd6fef1725 100644 --- a/pandora_console/operation/network/network_report.php +++ b/pandora_console/operation/network/network_report.php @@ -158,7 +158,8 @@ if ($is_network) { $action, $utimestamp_lower, $utimestamp_greater, - $main_value + $main_value, + $order_by ); }