Skip to content

Commit

Permalink
Fixing Issue #48 and other fixes
Browse files Browse the repository at this point in the history
* Missing Code in ip_filter function
* Update Translation Files
* Simplify Filtering
* Run Schedules in background
* Raise minimum version to 1.2.14
* Add some documentation
  • Loading branch information
TheWitness committed Nov 1, 2020
1 parent 89be300 commit f9c7e62
Show file tree
Hide file tree
Showing 49 changed files with 12,223 additions and 11,233 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

--- develop ---
--- 3.0 ---

* issue#31: In systemctl status : CMDPHP: ERROR: A DB Exec Failed!, Error: Unknown column 'INF' in 'field list'
* issue#32: Netflow v9 - Netflow source not providing either prefix or nexthop information
Expand All @@ -17,6 +17,7 @@
* issue#45: FlowView tab missing
* issue#46: Schedules dont work
* issue#47: flowData not showing data
* issue#48: Missing Code in ip_filter function
* issue#49: Flowview IPFIX throwing errors
* issue#50: Flowview errors cause it to become automatically disabled
* issue#51: FlowView Throws Errors When No Filters Exist
Expand All @@ -33,6 +34,7 @@
* feature: Remove use of Flow Tools
* feature: Support IPv4 and IPv6
* feature: Support daily and hourly partitioning
* feature: Run Schedules in Background

--- 2.1 ---
* issue: Prepare for sunrise theme in 1.1.17
Expand Down
2 changes: 1 addition & 1 deletion INFO
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ longname = FlowView
author = The Cacti Group
email =
homepage = http://www.cacti.net
compat = 1.2.4
compat = 1.2.14
capabilities = online_view:0, online_mgmt:0, offline_view:0, offline_mgmt:0, remote_collect:0
1 change: 1 addition & 0 deletions flowview.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
flowview_request_vars();
break;
case 'chartdata':
flowview_request_vars();
flowview_get_chartdata();
break;
case 'gettimespan':
Expand Down
10 changes: 4 additions & 6 deletions flowview_process.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

chdir(dirname(__FILE__) . '/../../');
include('./include/cli_check.php');
include_once('./lib/poller.php');
include_once('./plugins/flowview/functions.php');

ini_set('max_execution_time', 0);
Expand Down Expand Up @@ -95,13 +96,10 @@
AND ($t - sendinterval > lastsent)");

if (count($schedules)) {
$php = read_config_option('path_php_binary');
foreach ($schedules as $s) {
db_execute_prepared('UPDATE plugin_flowview_schedules
SET lastsent = ?
WHERE id = ?',
array($r, $s['id']));

plugin_flowview_run_schedule($s['id']);
debug('Running Schedule ' . $s['id']);
exec_background($php, ' -q ' . $config['base_path'] . '/plugins/flowview/run_schedule.php --schedule=' . $s['id']);
}
}

Expand Down
Loading

0 comments on commit f9c7e62

Please sign in to comment.