Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/plugin-ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,12 @@ jobs:
- name: Install flowview Plugin
run: |
cd ${{ github.workspace }}/cacti
# flowview's pre-install check requires a config.php; create it from the
# dist (which defaults to the Cacti database) only for the install and
# remove it afterwards so the unit tests still run with no config file.
cp plugins/flowview/config.php.dist plugins/flowview/config.php
sudo php cli/plugin_manage.php --plugin=flowview --install --enable
rm -f plugins/flowview/config.php

- name: Check PHP Syntax for Plugin
run: |
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

--- develop ---

* issue: Shorten the graph drilldown button title from 'View NetFlow Traffic In Range' to 'NetFlow' so it reads cleanly as a label in Cacti's graph action menu
* dev: Create the plugin's config.php from config.php.dist for the flowview install step in the integration-test workflow (removed immediately afterwards so the unit tests still run with no config file), so the install no longer fails with "needs configuration"
* feature: Add an optional FlowView Query Service (a long-running Go service under service/flowview-query) as a selectable Parallel Query Backend under FlowView Settings (default Legacy PHP Runner); when enabled, the parallel query parent runner (flowview_runner.php) delegates the whole query to the service over localhost instead of forking a PHP worker per shard, running the same cache-aware map-reduce (sharing parallel_database_query_shard_cache) and writing results back, with automatic fallback to the legacy runner when the service is unreachable

* bug: Load the pre-1.3 report compatibility shims (reports_run/reports_queue/reports_log_and_notify) only when the running Cacti is older than 1.3, decided with cacti_version_compare(CACTI_VERSION, '1.3', ...) rather than a function_exists() probe; because the plugin's functions.php is included during plugin init before core loads lib/reports.php, the function_exists() check ran while the now-native helpers were still absent, declared the shims, and core then fatally redeclared reports_log_and_notify() on 1.3.0 develop builds (falls back to function_exists() only when the Cacti version helpers are unavailable, e.g. the unit tests)
Expand Down
4 changes: 2 additions & 2 deletions locales/po/cacti.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Cacti \n"
"Report-Msgid-Bugs-To: developers@cacti.net\n"
"POT-Creation-Date: 2026-10-10 20:49-0400\n"
"POT-Creation-Date: 2026-10-12 14:40-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Cacti Developers <developers@cacti.net>>\n"
"Language-Team: Cacti Developers <developers@cacti.net>\n"
Expand Down Expand Up @@ -2792,5 +2792,5 @@ msgid "Flowview"
msgstr ""

#: setup.php
msgid "View NetFlow Traffic In Range"
msgid "NetFlow"
msgstr ""
2 changes: 1 addition & 1 deletion setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@ function flowview_graph_button($data): bool {
//cacti_log("The URL is this:" . $url);

if (api_user_realm_auth('flowview.php') && !empty($host_id)) {
print '<a class="iconLink flowview" href="' . html_escape($url) . '" title="' . __esc('View NetFlow Traffic In Range', 'flowview') . '"><i class="deviceRecovering fas fa-water"></i></a><br>';
print '<a class="iconLink flowview" href="' . html_escape($url) . '" title="' . __esc('NetFlow', 'flowview') . '"><i class="deviceRecovering fas fa-water"></i></a><br>';
}
}
return true;
Expand Down
Loading