Show filter enabled status and repair legacy state schema

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 --- develop ---
 
+* fix: Persist filter enabled state on fresh and existing installations, show enabled/disabled filter and schedule status using theme colours, and exclude disabled filters from report and schedule selection
 * fix: Make bundled Net_DNS2 constructor nullability explicit for PHP 8.4 without changing accepted arguments
 
 * 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

README.md

@@ -211,3 +211,37 @@ resolution.
 
 -----------------------------------------------
 Copyright (c) 2004-2026 - The Cacti Group, Inc.
+
+### Filter and schedule status
+
+Filters and schedules show Enabled in green and Disabled in grey, using the Cacti theme status classes. A disabled filter is excluded from report and schedule selectors and does not run scheduled reports. Disabling a filter does not stop its listener or delete history. Installations missing the filter state column retain existing filters as enabled when the column is created.
+
+Missing filter-state columns are repaired by the background upgrade process, including same-version repairs. Pages return a retry message until repair completes; scheduled reports defer without issuing schema changes. Editing a schedule retains its existing disabled filter and labels it Disabled.
+
+Pending filter-state migration leaves scheduled queue entries and lastsent/start timestamps unchanged. FlowView uses its own dispatcher on both Cacti versions: deferred or failed children retain their original occurrence, without saving a replacement. Native queue IDs and the older report-ID convention are both accepted. If resetting the retained row to pending fails, the row is kept and a queue-repair error is logged.
+
+Queue dispatch processes a bounded snapshot, attempting each occurrence once per pass. A failed occurrence stays retained while healthy entries continue; previously attempted rows sort behind new work so repeated failures cannot monopolize the next snapshot. Schema loss or exhausted concurrency stops the pass.
+
+Scheduler capacity checks remove exact child registrations only when the operating system confirms that their PID no longer exists. Live or uncertain processes (including permission errors and platforms without POSIX liveness probes) retain their capacity reservation. Failed legacy queue resets now log an explicit queue-repair error while retaining the original occurrence.
+
+
+FlowView uses one dispatcher on both supported Cacti versions. A child records
+`complete` after successful preparation/delivery and saved schedule timestamps,
+or `retry` only for a known pre-delivery deferral. These markers let a later
+poller reconcile a child that finishes after its parent's timeout. Completed
+occurrences are deleted without executing them again. Only pending work or an
+explicit retry marker can start a new child.
+
+Every started child requires a recorded outcome, including an exit code of zero.
+A timeout, crash or early exit with no recorded outcome leaves the occurrence `running` and
+logs its queue ID instead of automatically resending it. If it remains unresolved,
+check the child process and report/notification logs, then reconcile the specific
+`reports_queued` row: remove an already-delivered occurrence only after repairing
+its schedule timestamps, or return a confirmed undelivered occurrence to pending.
+Do not reset an unresolved row merely because its process has disappeared.
+
+Completion cleanup and executable reports use separate bounded snapshots, so
+persistent cleanup failures cannot consume the pending-work budget. Cleanup
+still runs first and does not require a free execution slot.
+
+Scheduled FlowView notifications use one observable delivery helper on Cacti 1.2 and 1.3. A failed queue lookup before delivery requests retry. A returned mailer error, invalid notification configuration, or failed report-log write holds the occurrence for manual reconciliation without advancing schedule timestamps. This includes partial delivery to multiple notification targets; it is never automatically resent.

flowview.php

@@ -34,6 +34,7 @@
 require_once($config['base_path'] . '/lib/time.php');
 
 flowview_connect();
+flowview_require_filter_status();
 
 set_default_action();
 
@@ -321,7 +322,7 @@ function load_session_for_filter() {
 			WHERE id = ?',
 			array(get_request_var('query')));
 
-		if (cacti_sizeof($query)) {
+		if (cacti_sizeof($query) && ($query['enabled'] ?? '') === 'on') {
 			foreach($query as $column => $value) {
 				switch($column) {
 					case 'name':

flowview_filters.php

@@ -34,6 +34,7 @@
 require_once($config['base_path'] . '/lib/timespan_settings.php');
 
 flowview_connect();
+flowview_require_filter_status();
 
 set_default_action();
 
@@ -382,6 +383,10 @@ function clearFilter() {
 			'align' => 'right',
 			'sort' => 'ASC'
 		),
+		'nosort2' => array(
+			'display' => __('Status', 'flowview'),
+			'align' => 'center'
+		),
 		'nosort1' => array(
 			'display' => __('Resolution', 'flowview'),
 			'align' => 'right',
@@ -421,6 +426,8 @@ function clearFilter() {
 			form_selectable_cell($type, $filter['id']);
 			form_selectable_cell($filter['id'], $filter['id'], '', 'right');
 			form_selectable_cell($sort, $filter['id'], '', 'right');
+			$status = flowview_filter_status($filter);
+			form_selectable_cell('<span class="' . $status['class'] . '">' . $status['label'] . '</span>', $filter['id'], '', 'center');
 			form_selectable_cell($filter['resolve'], $filter['id'], '', 'right');
 			form_checkbox_cell($filter['name'], $filter['id']);
 

flowview_schedules.php

@@ -32,6 +32,7 @@
 require_once($config['base_path'] . '/plugins/flowview/includes/functions.php');
 
 flowview_connect();
+flowview_require_filter_status();
 
 set_default_action();
 
@@ -56,12 +57,7 @@
 
 $formats = reports_get_format_files();
 
-$query_array = array_rekey(
-	flowview_db_fetch_assoc('SELECT id, name
-		FROM plugin_flowview_queries
-		ORDER BY name'),
-	'id', 'name'
-);
+$query_array = flowview_schedule_filters((int) get_filter_request_var('id'));
 
 if (db_table_exists('plugin_notification_lists')) {
 	$notification_lists = array_rekey(
@@ -1038,7 +1034,8 @@ function clearFilter() {
 				form_selectable_cell('-', $row['id'], '', 'right');
 			}
 
-			form_selectable_cell(($row['enabled'] == 'on' ? "<span class='deviceUp'><b>" . __('Yes', 'flowview') . "</b></span>":"<span class='deviceDown'><b>" . __('No', 'flowview') . "</b></span>"), $row['id'], '', 'right');
+			$status = flowview_filter_status($row);
+			form_selectable_cell('<span class="' . $status['class'] . '">' . $status['label'] . '</span>', $row['id'], '', 'right');
 			form_checkbox_cell($row['name'], $row['id']);
 
 			form_end_row();

flowview_upgrade.php

@@ -23,11 +23,12 @@
  +-------------------------------------------------------------------------+
 */
 
-chdir('../../');
+chdir(__DIR__ . '/../../');
 require('./include/cli_check.php');
 require_once('./plugins/flowview/includes/functions.php');
 require_once('./plugins/flowview/setup.php');
 require_once('./plugins/flowview/includes/database.php');
+require_once('./plugins/flowview/includes/filter_upgrade.php');
 
 flowview_connect();
 
@@ -81,25 +82,36 @@
 $info            = plugin_flowview_version();
 $current_version = $info['version'];
 
-/* do a version check */
-if ($forcever == '' && $old_version == $current_version) {
-	cacti_log('Your Flowview is already up to date (v' . $current_version . ' vs v' . $old_version . ') not upgrading.  Use --forcever to override', true, 'FLOWVIEW');
-	exit(0);
-}
-
-if (!register_process_start('flowview', 'upgrade', 1, 86400)) {
+$registered = register_process_start('flowview', 'upgrade', 1, 86400);
+if (!$registered) {
 	if (empty($forcever)) {
 		print 'WARNING: Running process detected.  To override use --forcever' . PHP_EOL;
 		exit(1);
 	}
 }
 
+if ($registered) {
+	$upgrade_pid = getmypid();
+	register_shutdown_function(static function () use ($upgrade_pid) {
+		unregister_process('flowview', 'upgrade', 1, $upgrade_pid);
+	});
+}
+
+if (!flowview_filter_status_upgrade()) {
+	cacti_log('FlowView filter state upgrade failed; it will be retried.', true, 'FLOWVIEW');
+	exit(1);
+}
+
+/* do a version check */
+if ($forcever == '' && $old_version == $current_version) {
+	cacti_log('Your Flowview is already up to date (v' . $current_version . ' vs v' . $old_version . ') not upgrading.  Use --forcever to override', true, 'FLOWVIEW');
+	exit(0);
+}
+
 cacti_log('Upgrading from v' . $old_version . ' to ' . $current_version, true, 'FLOWVIEW');
 
 flowview_upgrade($current_version, $old_version);
 
-unregister_process('flowview', 'upgrade', 1);
-
 exit(0);
 
 /**

includes/database.php

@@ -514,3 +514,8 @@ function flowview_db_get_table_column_types($table, mixed $cnn_id = false) {
 
     return $cols;
 }
+
+/** Check live metadata without Cacti's per-request column cache. */
+function flowview_filter_status_ready(): bool {
+	return (bool) flowview_db_fetch_row("SHOW COLUMNS FROM plugin_flowview_queries LIKE 'enabled'", false);
+}

includes/filter_upgrade.php

@@ -0,0 +1,18 @@
+<?php
+/* Copyright (C) 2004-2026 The Cacti Group. GPL-2.0-or-later. */
+
+// Loaded by flowview_upgrade.php after Cacti's CLI bootstrap. Keep schema
+// mutations out of database.php, which is included by ordinary web requests.
+/** Repair legacy state only from the background upgrade process. */
+function flowview_filter_status_upgrade(): bool {
+	if (!flowview_db_table_exists('plugin_flowview_queries')) {
+		return false;
+	}
+	if (flowview_filter_status_ready()) {
+		return true;
+	}
+	if (flowview_db_execute("ALTER TABLE plugin_flowview_queries ADD COLUMN enabled char(2) NOT NULL DEFAULT 'on' AFTER name", false)) {
+		return true;
+	}
+	return flowview_filter_status_ready();
+}