Skip to content

Commit f9c7e62

Browse files
committed
Fixing Issue #48 and other fixes
* 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
1 parent 89be300 commit f9c7e62

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+12223
-11233
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
--- develop ---
3+
--- 3.0 ---
44

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

3739
--- 2.1 ---
3840
* issue: Prepare for sunrise theme in 1.1.17

INFO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ longname = FlowView
55
author = The Cacti Group
66
email =
77
homepage = http://www.cacti.net
8-
compat = 1.2.4
8+
compat = 1.2.14
99
capabilities = online_view:0, online_mgmt:0, offline_view:0, offline_mgmt:0, remote_collect:0

flowview.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
flowview_request_vars();
4444
break;
4545
case 'chartdata':
46+
flowview_request_vars();
4647
flowview_get_chartdata();
4748
break;
4849
case 'gettimespan':

flowview_process.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
chdir(dirname(__FILE__) . '/../../');
2626
include('./include/cli_check.php');
27+
include_once('./lib/poller.php');
2728
include_once('./plugins/flowview/functions.php');
2829

2930
ini_set('max_execution_time', 0);
@@ -95,13 +96,10 @@
9596
AND ($t - sendinterval > lastsent)");
9697

9798
if (count($schedules)) {
99+
$php = read_config_option('path_php_binary');
98100
foreach ($schedules as $s) {
99-
db_execute_prepared('UPDATE plugin_flowview_schedules
100-
SET lastsent = ?
101-
WHERE id = ?',
102-
array($r, $s['id']));
103-
104-
plugin_flowview_run_schedule($s['id']);
101+
debug('Running Schedule ' . $s['id']);
102+
exec_background($php, ' -q ' . $config['base_path'] . '/plugins/flowview/run_schedule.php --schedule=' . $s['id']);
105103
}
106104
}
107105

0 commit comments

Comments
 (0)