mirror of
https://github.com/Cacti/plugin_thold.git
synced 2026-10-23 03:27:05 +09:00
* INFO: set compat to 1.2.32 * docs: update Copilot instructions Cacti baseline to 1.2.32 (matches INFO compat) * INFO: back off compat to 1.2.29 * Add manifest.json + upgrade-time file pruning * Prune phpunit.xml on upgrade and ignore markdown-lint configs phpunit.xml ships in the repo for CI but is a dev-only test artifact, so it is removed from manifest.json 'expected', pruned from installs on upgrade (like tests/), and excluded from the manifest drift check. The retired markdown-lint configs (.mdlrc, .md_style.rb) are deleted, and .md* is now ignored like .git*: protected from pruning and excluded from drift if it reappears. * Move thold_functions.php and thold_webapi.php into includes/; flatten css The main threshold library becomes includes/functions.php and the web API helper becomes includes/webapi.php; every caller (setup.php, includes/*, the CLI/poller/notify entry points and the test suite) loads them from includes/. Each per-theme stylesheet css/<theme>/main.css becomes css/<theme>.css so users can drop their own css/<theme>.css into the css base, and the page_head hook looks there. Old paths are tombstoned so existing installs drop the stale copies on upgrade. * Regenerate cacti.pot for the includes/ file relocations Moving the plugin's library files into includes/ changed the source-reference lines in the translation template; regenerate it so the 'Verify translation template' CI check passes. * Harden the hook-include test and make RPN integer ops explicit The HookFunctionsIncludeTest invokes real hooks with placeholder input purely to execute their relocated include_once lines; it now swallows engine notices/warnings/deprecations during those calls (and restores the error handler and config afterward) so it cannot trip the suite's failOnDeprecation or leak state into other tests. The RPN % and ^ operators now cast their operands to int explicitly, matching their long-standing integer-truncation behaviour while silencing the implicit float-to-int conversion deprecation. * Harden prune against tampered-manifest path traversal The upgrade-time prune now rejects any tombstone containing '.'/'..' segments (which could escape the plugin directory or resolve to its root) and treats ancestors of whitelist entries as protected, so a tombstone on a parent directory can no longer delete a whitelisted file beneath it. * docs: update and align the Project Structure block Point the structure tree at the relocated files (libraries now under includes/, data files under docs/, stylesheets under css/) and align the trailing '# ...' comments to a single column so they no longer drift right. * docs/tests: standardize test header and correct manifest-contract notes - Use the full license header (from the plugin's own setup.php) in tests/Unit/PruneFilesTest.php instead of the abbreviated copyright banner. - Document that the manifest drift check and the upgrade-time prune also handle phpunit.xml and .md* files, matching the implemented behavior. * refactor: rename prune helpers to the plugin-slug function prefix The repository naming contract reserves the plugin_<name>_ prefix for plugin lifecycle / hook-registration functions; all other functions use the plain <name>_ prefix. Rename the internal upgrade helpers accordingly: plugin_<name>_prune_files() -> <name>_prune_files() plugin_<name>_rmtree() -> <name>_rmtree() The call site, unit tests, and the copilot-instructions.md references are updated to match. No behavioral change. * chore: set the Cacti compatibility floor to 1.2.29 Align the compat metadata (and the contributor-guide references) with the team decision to standardize the minimum supported Cacti version at 1.2.29; the previously proposed 1.2.32 floor was not adopted. --------- Co-authored-by: Copilot <copilot@users.noreply.github.com>
414 lines
14 KiB
PHP
414 lines
14 KiB
PHP
<?php
|
|
/*
|
|
+-------------------------------------------------------------------------+
|
|
| Copyright (C) 2004-2026 The Cacti Group |
|
|
| |
|
|
| This program is free software; you can redistribute it and/or |
|
|
| modify it under the terms of the GNU General Public License |
|
|
| as published by the Free Software Foundation; either version 2 |
|
|
| of the License, or (at your option) any later version. |
|
|
+-------------------------------------------------------------------------+
|
|
| Cacti: The Complete RRDtool-based Graphing Solution |
|
|
+-------------------------------------------------------------------------+
|
|
| http://www.cacti.net/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
/**
|
|
* Which thresholds a poller run evaluates, and what it does with the dirty
|
|
* flag afterwards.
|
|
*/
|
|
final class PollerSchedulingTest extends TestCase {
|
|
/**
|
|
* @return void
|
|
*/
|
|
public static function setUpBeforeClass(): void {
|
|
self::loadPluginSource('includes/functions.php');
|
|
self::loadPluginSource('includes/polling.php');
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
protected function setUp(): void {
|
|
parent::setUp();
|
|
|
|
$GLOBALS['config']['poller_id'] = 1;
|
|
$GLOBALS['config']['base_path'] = sys_get_temp_dir() . '/thold-poller-scheduling';
|
|
|
|
$plugins = $GLOBALS['config']['base_path'] . '/plugins';
|
|
|
|
if (!is_dir($plugins)) {
|
|
mkdir($plugins, 0777, true);
|
|
}
|
|
|
|
if (!file_exists($plugins . '/thold')) {
|
|
symlink(dirname(__DIR__, 2), $plugins . '/thold');
|
|
}
|
|
|
|
/*
|
|
* includes/polling.php includes Cacti's lib/time.php at call time.
|
|
* Supply an empty one under the configured base path; nothing under
|
|
* test reads from it.
|
|
*/
|
|
$lib = $GLOBALS['config']['base_path'] . '/lib';
|
|
|
|
if (!is_dir($lib)) {
|
|
mkdir($lib, 0777, true);
|
|
}
|
|
|
|
if (!file_exists($lib . '/time.php')) {
|
|
file_put_contents($lib . '/time.php', "<?php\n");
|
|
}
|
|
|
|
CactiStubs::willReturnFor('db_fetch_row_prepared', 'FROM host WHERE id = ?', [
|
|
'id' => 2,
|
|
'description' => 'core-switch-1',
|
|
'hostname' => '10.0.0.1',
|
|
'location' => 'rack 4',
|
|
'site_id' => 1,
|
|
'status' => 3,
|
|
'status_fail_date' => '2026-01-01 00:00:00',
|
|
'status_rec_date' => '2026-01-02 00:00:00',
|
|
'status_last_error' => '',
|
|
'snmp_engine_id' => '',
|
|
'notes' => '',
|
|
]);
|
|
}
|
|
|
|
/**
|
|
* A threshold row with every column the evaluator reads, set so that it
|
|
* evaluates quietly. Only the identifier varies between rows here; what is
|
|
* under test is which rows are visited, not what visiting them decides.
|
|
*
|
|
* @param int $id
|
|
*
|
|
* @return array<string, mixed>
|
|
*/
|
|
private function threshold($id) {
|
|
return [
|
|
'id' => $id, 'host_id' => 2, 'local_data_id' => 4, 'local_graph_id' => 9,
|
|
'data_template_rrd_id' => 3, 'name' => 'CPU', 'name_cache' => 'CPU',
|
|
'data_source_name' => 'traffic_in', 'thold_type' => 0, 'data_type' => 0,
|
|
'lastread' => 50, 'oldvalue' => 50, 'lasttime' => 0, 'rrd_step' => 300,
|
|
'thold_hi' => '', 'thold_low' => '', 'thold_warning_hi' => '', 'thold_warning_low' => '',
|
|
'thold_fail_trigger' => 1, 'thold_warning_fail_trigger' => 1,
|
|
'thold_fail_count' => 0, 'thold_warning_fail_count' => 0,
|
|
'thold_alert' => 0, 'repeat_alert' => 0,
|
|
'time_hi' => '', 'time_low' => '', 'time_warning_hi' => '', 'time_warning_low' => '',
|
|
'time_fail_trigger' => 1, 'time_warning_fail_trigger' => 1,
|
|
'time_fail_length' => 300, 'time_warning_fail_length' => 300,
|
|
'bl_fail_count' => 0, 'bl_alert' => 0, 'bl_pct_down' => '', 'bl_pct_up' => '',
|
|
'bl_fail_trigger' => 1, 'bl_ref_time_range' => 3600, 'bl_type' => 0,
|
|
'bl_cf' => 'AVG', 'bl_thold_valid' => 0, 'cdef' => 0,
|
|
'notify_warning' => 0, 'notify_alert' => 0, 'notify_extra' => '',
|
|
'notify_warning_extra' => '', 'persist_ack' => '', 'reset_ack' => '',
|
|
'acknowledgment' => '', 'exempt' => '', 'restored_alert' => '',
|
|
'syslog_enabled' => '', 'syslog_priority' => 5, 'syslog_facility' => 1,
|
|
'snmp_event_severity' => 3, 'snmp_event_description' => '', 'snmp_engine_id' => '',
|
|
'trigger_cmd_high' => '', 'trigger_cmd_low' => '', 'trigger_cmd_norm' => '',
|
|
'notes' => '', 'dnotes' => '', 'external_id' => '',
|
|
'email_subject' => '', 'email_subject_warn' => '', 'email_subject_restoral' => '',
|
|
'graph_timespan' => 7, 'show_units' => '', 'units_suffix' => '', 'decimals' => 2,
|
|
'format_file' => '', 'thold_enabled' => 'on', 'thold_daemon_id' => 0,
|
|
];
|
|
}
|
|
|
|
/**
|
|
* Only the thresholds that were evaluated get their dirty flag cleared.
|
|
*
|
|
* Clearing by poller, or across the whole table, also cleared the ones
|
|
* whose data arrived after the select, so those readings were dropped
|
|
* without ever being checked.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testOnlyTheEvaluatedThresholdsAreCleared(): void {
|
|
CactiStubs::willReturnFor('db_fetch_assoc', 'FROM thold_data', [
|
|
$this->threshold(7),
|
|
$this->threshold(9),
|
|
]);
|
|
|
|
thold_check_all_thresholds();
|
|
|
|
$clears = array_values(array_filter(CactiStubs::callsTo('db_execute_prepared'), static function ($call) {
|
|
return strpos($call['sql'], 'SET tcheck = 0') !== false;
|
|
}));
|
|
|
|
$this->assertCount(1, $clears);
|
|
$this->assertSame([7, 9], $clears[0]['params']);
|
|
$this->assertStringContainsString('WHERE id IN (?, ?)', $clears[0]['sql']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testNothingIsClearedWhenNothingWasEvaluated(): void {
|
|
CactiStubs::willReturnFor('db_fetch_assoc', 'FROM thold_data', []);
|
|
|
|
thold_check_all_thresholds();
|
|
|
|
$clears = array_filter(CactiStubs::$calls, static function ($call) {
|
|
return strpos($call['sql'], 'tcheck = 0') !== false;
|
|
});
|
|
|
|
$this->assertSame([], array_values($clears));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testTheRunReportsHowManyThresholdsItEvaluated(): void {
|
|
CactiStubs::willReturnFor('db_fetch_assoc', 'FROM thold_data', [
|
|
$this->threshold(1),
|
|
$this->threshold(2),
|
|
$this->threshold(3),
|
|
]);
|
|
|
|
$this->assertSame(3, thold_check_all_thresholds());
|
|
}
|
|
|
|
/**
|
|
* The whole table is never cleared in one statement.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testTheDirtyFlagIsNeverClearedTableWide(): void {
|
|
CactiStubs::willReturnFor('db_fetch_assoc', 'FROM thold_data', [
|
|
$this->threshold(7),
|
|
]);
|
|
|
|
thold_check_all_thresholds();
|
|
|
|
foreach (CactiStubs::$calls as $call) {
|
|
if (strpos($call['sql'], 'tcheck = 0') !== false) {
|
|
$this->assertStringContainsString('WHERE id IN', $call['sql']);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The daemon path batches readings before writing them, and the batch size
|
|
* is what array_chunk() takes. Passing a count meant 500 readings became
|
|
* 50 batches of 10 rather than 10 of 50, and each batch costs a round trip.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testTheDaemonWritesReadingsInBatchesOfFifty(): void {
|
|
CactiStubs::$configOptions['thold_daemon_enable'] = 'on';
|
|
|
|
$readings = [];
|
|
|
|
for ($i = 1; $i <= 120; $i++) {
|
|
$readings[] = ['local_data_id' => $i, 'times' => [1700000000 => ['traffic_in' => 5]]];
|
|
}
|
|
|
|
// One threshold per reading, answering with just the batch that was asked
|
|
// about so each write matches the readings it was given.
|
|
CactiStubs::willReturnFor('db_fetch_assoc', 'SELECT id, local_data_id, thread_id', static function ($sql) {
|
|
preg_match('/IN \(([^)]*)\)/', $sql, $matches);
|
|
|
|
return array_map(static function ($id) {
|
|
$id = (int) trim($id);
|
|
|
|
return ['id' => $id, 'local_data_id' => $id, 'thread_id' => 1];
|
|
}, explode(',', $matches[1]));
|
|
});
|
|
|
|
thold_poller_output($readings);
|
|
|
|
$inserts = array_values(array_filter(CactiStubs::$calls, static function ($call) {
|
|
return strpos($call['sql'], 'plugin_thold_daemon_data') !== false;
|
|
}));
|
|
|
|
// 120 readings at 50 to a batch is three writes, not one per reading.
|
|
$this->assertCount(3, $inserts);
|
|
}
|
|
|
|
/**
|
|
* A threshold row shaped like thold_poller_output()'s non-daemon query
|
|
* (td/dtr/dtd columns), evaluating quietly as a gauge.
|
|
*
|
|
* @param array<string, mixed> $overrides
|
|
*
|
|
* @return array<string, mixed>
|
|
*/
|
|
private function pollerThreshold(array $overrides = []) {
|
|
return $overrides + [
|
|
'id' => 9,
|
|
'thold_name' => 'CPU',
|
|
'local_graph_id' => 9,
|
|
'percent_ds' => '',
|
|
'expression' => '',
|
|
'upper_ds' => '',
|
|
'data_type' => 0,
|
|
'cdef' => 0,
|
|
'local_data_id' => 4,
|
|
'data_template_rrd_id' => 3,
|
|
'lastread' => '',
|
|
'lasttime' => 0,
|
|
'oldvalue' => '',
|
|
'name' => 'traffic_in',
|
|
'data_source_type_id' => 1,
|
|
'rrd_step' => 300,
|
|
'rrd_maximum' => 0,
|
|
'rrd_heartbeat' => 600,
|
|
];
|
|
}
|
|
|
|
/**
|
|
* A numeric reading turns into a sample_row, which is written through the
|
|
* FROM_UNIXTIME() upsert - not the status-only insert added alongside it.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testNonDaemonPathPersistsANumericSampleRow(): void {
|
|
CactiStubs::willReturnFor('db_fetch_assoc', 'dtr.rrd_maximum, dtr.rrd_heartbeat', [
|
|
$this->pollerThreshold(),
|
|
]);
|
|
|
|
$readings = [
|
|
['local_data_id' => 4, 'times' => [1700000300 => ['traffic_in' => 55]]],
|
|
];
|
|
|
|
thold_poller_output($readings);
|
|
|
|
$upserts = array_values(array_filter(CactiStubs::$calls, static function ($call) {
|
|
return strpos($call['sql'], 'FROM_UNIXTIME(?)') !== false
|
|
&& in_array(1700000300, $call['params'], true);
|
|
}));
|
|
|
|
$this->assertCount(1, $upserts);
|
|
|
|
$status_inserts = array_filter(CactiStubs::callsTo('db_execute_prepared'), static function ($call) {
|
|
return strpos($call['sql'], 'INSERT INTO thold_data') !== false && strpos($call['sql'], 'lasttime') === false;
|
|
});
|
|
|
|
$this->assertSame([], array_values($status_inserts));
|
|
}
|
|
|
|
/**
|
|
* An unavailable reading (non-numeric raw value) turns into a status-only
|
|
* row instead - persisting tcheck/lastread without fabricating a sample
|
|
* time, and without touching the FROM_UNIXTIME() upsert.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testNonDaemonPathPersistsAStatusOnlyRowForAnUnavailableReading(): void {
|
|
CactiStubs::willReturnFor('db_fetch_assoc', 'dtr.rrd_maximum, dtr.rrd_heartbeat', [
|
|
$this->pollerThreshold(),
|
|
]);
|
|
|
|
$readings = [
|
|
['local_data_id' => 4, 'times' => [1700000300 => ['traffic_in' => 'U']]],
|
|
];
|
|
|
|
thold_poller_output($readings);
|
|
|
|
$status_inserts = array_values(array_filter(CactiStubs::callsTo('db_execute_prepared'), static function ($call) {
|
|
return strpos($call['sql'], 'INSERT INTO thold_data') !== false && strpos($call['sql'], 'lasttime') === false;
|
|
}));
|
|
|
|
$this->assertCount(1, $status_inserts);
|
|
$this->assertSame([9, 1, ''], $status_inserts[0]['params']);
|
|
|
|
$sample_upserts = array_filter(CactiStubs::$calls, static function ($call) {
|
|
return strpos($call['sql'], 'FROM_UNIXTIME') !== false;
|
|
});
|
|
|
|
$this->assertSame([], array_values($sample_upserts));
|
|
}
|
|
|
|
/**
|
|
* With thold_consider_unknown_zero enabled, an unavailable reading is
|
|
* still preserved as unavailable (never manufactured into a zero) - this
|
|
* setting only controls whether that fact gets logged, not the outcome.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testNonDaemonPathLogsAndStillPreservesUnavailableStateWhenConsiderUnknownZeroIsOn(): void {
|
|
CactiStubs::willReturnFor('db_fetch_assoc', 'dtr.rrd_maximum, dtr.rrd_heartbeat', [
|
|
$this->pollerThreshold(),
|
|
]);
|
|
CactiStubs::$configOptions['thold_consider_unknown_zero'] = 'on';
|
|
CactiStubs::$configOptions['thold_log_unknown_to_zero'] = 'on';
|
|
|
|
$readings = [
|
|
['local_data_id' => 4, 'times' => [1700000300 => ['traffic_in' => 'U']]],
|
|
];
|
|
|
|
thold_poller_output($readings);
|
|
|
|
$notes = array_values(array_filter(CactiStubs::$log, static function ($message) {
|
|
return strpos($message, 'would have been treated as zero') !== false;
|
|
}));
|
|
|
|
$this->assertNotEmpty($notes);
|
|
|
|
$status_inserts = array_values(array_filter(CactiStubs::callsTo('db_execute_prepared'), static function ($call) {
|
|
return strpos($call['sql'], 'INSERT INTO thold_data') !== false && strpos($call['sql'], 'lasttime') === false;
|
|
}));
|
|
|
|
$this->assertCount(1, $status_inserts);
|
|
$this->assertSame([9, 1, ''], $status_inserts[0]['params']);
|
|
}
|
|
|
|
/**
|
|
* Either write path counts as an update, so the deleted-tholds cleanup
|
|
* still runs afterwards.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testNonDaemonPathRunsCleanupAfterWriting(): void {
|
|
CactiStubs::willReturnFor('db_fetch_assoc', 'dtr.rrd_maximum, dtr.rrd_heartbeat', [
|
|
$this->pollerThreshold(),
|
|
]);
|
|
|
|
$readings = [
|
|
['local_data_id' => 4, 'times' => [1700000300 => ['traffic_in' => 55]]],
|
|
];
|
|
|
|
thold_poller_output($readings);
|
|
|
|
$cleanup = array_filter(CactiStubs::callsTo('db_execute_prepared'), static function ($call) {
|
|
return strpos($call['sql'], 'DELETE FROM thold_data WHERE local_data_id = 0') !== false;
|
|
});
|
|
|
|
$this->assertCount(1, $cleanup);
|
|
}
|
|
|
|
/**
|
|
* A structural guard rather than a behavioural one: the defect is SQL
|
|
* operator precedence, and proving it needs a database to run the query
|
|
* against. Without the parentheses, AND binds tighter than OR and the
|
|
* clause reads as
|
|
*
|
|
* (... AND h.poller_id = 1) OR (h.poller_id IS NULL AND tcheck = 1 AND status = 3)
|
|
*
|
|
* whose first branch carries neither the dirty-flag nor the device-status
|
|
* filter, so every enabled threshold is re-evaluated on every run.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testThePollerAlternationIsParenthesised(): void {
|
|
$src = file_get_contents(dirname(__DIR__, 2) . '/includes/polling.php');
|
|
|
|
$this->assertStringContainsString('AND (h.poller_id = 1 OR h.poller_id IS NULL)', $src);
|
|
$this->assertStringNotContainsString("AND h.poller_id = 1 OR h.poller_id IS NULL\n", $src);
|
|
}
|
|
|
|
/**
|
|
* array_chunk() takes the size of each chunk. Passing a count meant 500
|
|
* readings became 50 chunks of 10 rather than 10 chunks of 50, and each
|
|
* chunk costs a round trip.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testTheDaemonBatchesReadingsFiftyAtATime(): void {
|
|
$src = file_get_contents(dirname(__DIR__, 2) . '/includes/polling.php');
|
|
|
|
$this->assertStringContainsString('array_chunk($rrd_update_array, 50, true)', $src);
|
|
$this->assertStringNotContainsString('ceil(sizeof($rrd_update_array) / 50)', $src);
|
|
}
|
|
}
|