Merge branch 'ent-3793-fallo-en-la-resolucion-de-los-informes-de-netflow' into 'develop'

Fixed netflow reports resolution

Closes pandora_enterprise#3793

See merge request artica/pandorafms!2310
This commit is contained in:
Daniel Rodriguez 2019-07-15 14:21:19 +02:00
commit 69da2f22ec
1 changed files with 3 additions and 3 deletions

View File

@ -35,8 +35,8 @@ define('NETFLOW_RES_LOWD', 6);
define('NETFLOW_RES_MEDD', 12); define('NETFLOW_RES_MEDD', 12);
define('NETFLOW_RES_HID', 24); define('NETFLOW_RES_HID', 24);
define('NETFLOW_RES_ULTRAD', 30); define('NETFLOW_RES_ULTRAD', 30);
define('NETFLOW_RES_HOURLY', 'hourly'); define('NETFLOW_RES_HOURLY', -1);
define('NETFLOW_RES_DAILY', 'daily'); define('NETFLOW_RES_DAILY', -2);
define('NETFLOW_MAX_DATA_CIRCULAR_MESH', 10000); define('NETFLOW_MAX_DATA_CIRCULAR_MESH', 10000);
@ -473,7 +473,7 @@ function netflow_get_data(
// Put all points into an array. // Put all points into an array.
$intervals = [($start_date - $multiplier_time)]; $intervals = [($start_date - $multiplier_time)];
while ((end($intervals) < $end_date) === true) { while (($next = (end($intervals) + $multiplier_time) < $end_date) === true) {
$intervals[] = (end($intervals) + $multiplier_time); $intervals[] = (end($intervals) + $multiplier_time);
} }