tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added display of the default Netflow starting from the last hour

Browse Source
This commit is contained in:
Jorge Rincon 2023-09-08 11:17:57 +02:00
parent 885ed9747b
commit 142624fdd5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/operation/network/network_usage_map.php
View File

@ -87,6 +87,7 @@ $action = get_parameter('action', 'talkers');
// Calculate range dates. // Calculate range dates.
$custom_date = get_parameter('custom_date', '0'); $custom_date = get_parameter('custom_date', '0');
$date = get_parameter('date', SECONDS_1DAY); $date = get_parameter('date', SECONDS_1DAY);
$default_date_netflow = false;
if ($custom_date === '1') { if ($custom_date === '1') {
$date_init = get_parameter('date_init'); $date_init = get_parameter('date_init');
$time_init = get_parameter('time_init'); $time_init = get_parameter('time_init');
@ -99,11 +100,11 @@ if ($custom_date === '1') {
$date_units = get_parameter('date_units'); $date_units = get_parameter('date_units');
$period = ($date_text * $date_units); $period = ($date_text * $date_units);
$date_to = strtotime(date('Y-m-d H:i:s')); $date_to = strtotime(date('Y-m-d H:i:s'));
$date_from = (strtotime($date_to) - $period); $date_from = ($date_to - $period);
} else if (in_array($date, ['this_week', 'this_month', 'past_week', 'past_month'])) { } else if (in_array($date, ['this_week', 'this_month', 'past_week', 'past_month'])) {
if ($date === 'this_week') { if ($date === 'this_week') {
$date_from = strtotime('last monday'); $date_from = strtotime('last monday');
$date_to = strtotime($date_from.' +6 days'); $date_to = strtotime(date('Y/m/d h:i:s', $date_from).' +6 days');
} else if ($date === 'this_month') { } else if ($date === 'this_month') {
$date_from = strtotime('first day of this month'); $date_from = strtotime('first day of this month');
$date_to = strtotime('last day of this month'); $date_to = strtotime('last day of this month');
@ -116,7 +117,10 @@ if ($custom_date === '1') {
} }
} else { } else {
$date_to = strtotime(date('Y-m-d H:i:s')); $date_to = strtotime(date('Y-m-d H:i:s'));
$date_from = ($date_to - $date); // Set last hour by default.
$date_from = strtotime(date('Y-m-d H:i:s').'- 1 hour');
$top = 10;
$default_date_netflow = true;
} }
$advanced_filter = get_parameter('advanced_filter', ''); $advanced_filter = get_parameter('advanced_filter', '');
@ -313,7 +317,7 @@ ui_toggle(
$has_data = false; $has_data = false;
if ((bool) get_parameter('update_netflow') === true) { if ((bool) get_parameter('update_netflow') === true || $default_date_netflow === true) {
$map_data = netflow_build_map_data( $map_data = netflow_build_map_data(
$date_from, $date_from,
$date_to, $date_to,