INFO: set compat to 1.2.29

.github/workflows/plugin-ci-workflow.yml

@@ -89,6 +89,9 @@ jobs:
     - name: Check PHP version
       run: php -v
 
+    - name: Validate plugin manifest (expected-file drift)
+      run: php cacti/plugins/thold/tests/bin/validate-manifest.php
+
     - name: Run apt-get update
       run: sudo apt-get update
 

INFO

@@ -26,5 +26,5 @@ longname = Thresholds
 author = The Cacti Group
 email = 
 homepage = http://www.cacti.net
-compat = 1.2.25
+compat = 1.2.29
 capabilities = online_view:1, online_mgmt:1, offline_view:0, offline_mgmt:0, remote_collect:1

README.md

@@ -129,6 +129,12 @@ thresholds, note that you must modify and install the thold_daemon.service file
 into your systemd configuration, and then start and test the service.  If you
 fail to perform these steps, thold will appear to not work as expected.
 
+When upgrading the plugin while the Threshold Daemon is running, restart the
+`thold_daemon` service (for example `systemctl restart thold_daemon`) after
+the upgrade so the long-lived process picks up the new code. On upgrade the
+plugin also prunes its own bundled development-only files (for example the
+`tests/` directory) from the installed tree.
+
 Lastly, please note that several forks of the thold plugin are available from
 different sources.  These forks of thold are not necessarily compatible with the
 current version of Cacti's thold plugin.  Please be aware of this when

cli_import.php

@@ -29,7 +29,7 @@
 
 include(__DIR__ . '/../../include/cli_check.php');
 include_once($config['base_path'] . '/lib/xml.php');
-include_once($config['base_path'] . '/plugins/thold/thold_functions.php');
+include_once($config['base_path'] . '/plugins/thold/includes/functions.php');
 
 // set the defaults
 $force    = false;

cli_thresholds.php

@@ -35,7 +35,7 @@
 
 include('./include/cli_check.php');
 
-include_once($config['base_path'] . '/plugins/thold/thold_functions.php');
+include_once($config['base_path'] . '/plugins/thold/includes/functions.php');
 
 // set the defaults
 $force     = false;

includes/database.php

@@ -50,7 +50,7 @@ function thold_upgrade_database($force = false) {
 	thold_setup_database();
 
 	include_once($config['base_path'] . '/plugins/thold/setup.php');
-	include_once($config['base_path'] . '/plugins/thold/thold_functions.php');
+	include_once($config['base_path'] . '/plugins/thold/includes/functions.php');
 
 	$v = plugin_thold_version();
 

thold_functions.php → includes/functions.php

@@ -482,12 +482,12 @@ function thold_rpn_math_binary($operator, $v2, $v1) {
 		case '/':
 			return $v2 / $v1;
 		case '%':
-			return $v2 % $v1;
+			return (int) $v2 % (int) $v1;
 		case '^':
 			// Bitwise XOR, not exponentiation: eval('$v3 = ' . $v2 . ' ^ ' . $v1 . ';')
 			// always computed XOR (PHP's ^ operator), and existing user thresholds
 			// rely on that. See TholdExpressionMathRpnTest::testCaretOperatorIsIntegerXorNotExponentiation.
-			return $v2 ^ $v1;
+			return (int) $v2 ^ (int) $v1;
 		default:
 			cacti_log("ERROR: RPN unknown binary operator '$operator'", false, 'THOLD');
 			$rpn_error = true;

includes/polling.php

@@ -116,7 +116,7 @@ function thold_cleanup_log() {
 function thold_poller_output(&$rrd_update_array) {
 	global $config, $debug;
 
-	include_once($config['base_path'] . '/plugins/thold/thold_functions.php');
+	include_once($config['base_path'] . '/plugins/thold/includes/functions.php');
 	include_once($config['library_path'] . '/snmp.php');
 
 	$rrd_reindexed      = [];
@@ -338,7 +338,7 @@ function thold_check_all_thresholds() {
 	global $config;
 
 	include($config['base_path'] . '/plugins/thold/includes/arrays.php');
-	include_once($config['base_path'] . '/plugins/thold/thold_functions.php');
+	include_once($config['base_path'] . '/plugins/thold/includes/functions.php');
 	include_once($config['base_path'] . '/lib/time.php');
 
 	if (read_config_option('remote_storage_method') == 1) {
@@ -461,7 +461,7 @@ function thold_update_host_status() {
 		return 0;
 	}
 
-	include_once($config['base_path'] . '/plugins/thold/thold_functions.php');
+	include_once($config['base_path'] . '/plugins/thold/includes/functions.php');
 	include_once($config['library_path'] . '/snmp.php');
 
 	if (api_plugin_is_enabled('maint')) {

includes/settings.php

@@ -466,7 +466,7 @@ function thold_config_settings() {
 
 	include($config['base_path'] . '/plugins/thold/includes/arrays.php');
 	include_once($config['base_path'] . '/plugins/thold/setup.php');
-	include_once($config['base_path'] . '/plugins/thold/thold_functions.php');
+	include_once($config['base_path'] . '/plugins/thold/includes/functions.php');
 	include_once($config['base_path'] . '/plugins/thold/includes/database.php');
 
 	// check to see if there is an upgrade required

thold_webapi.php → includes/webapi.php

@@ -39,7 +39,7 @@
 function thold_add_graphs_action_execute() {
 	global $config;
 
-	include_once($config['base_path'] . '/plugins/thold/thold_functions.php');
+	include_once($config['base_path'] . '/plugins/thold/includes/functions.php');
 
 	$host_id           = get_filter_request_var('host_id');
 	$local_graph_id    = get_filter_request_var('local_graph_id');