fix(reboot): suppress webhook alerts during a fleet reboot, regardless of cache driver
Existing Cache::has('unifi:planned_reboot:{mac}') per-MAC suppression
relies on the cache driver being shared across the scheduler and the
snapshot-capture containers. In environments where the cache is
backed by something process-local (or where the keys expire before a
slow reboot completes), webhook alerts fire even though the dashboard
itself initiated the reboots.
RebootAllAps now also stamps a single Setting
(unifi.reboot_suppression_until) at the start of a fleet reboot,
covering a 20-minute window. WebhookCheckService checks this Setting
in addition to the per-MAC cache key, in checkDeviceTransition and
checkReboot. Setting is database-backed so it's always visible across
containers regardless of cache configuration.
v1.11.1.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "dashboard/unifi",
|
"name": "dashboard/unifi",
|
||||||
"description": "UniFi network management, WiFi stats, and captive portal authentication for the Dashboard platform",
|
"description": "UniFi network management, WiFi stats, and captive portal authentication for the Dashboard platform",
|
||||||
"version": "1.11.0",
|
"version": "1.11.1",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|||||||
@@ -181,7 +181,11 @@ class WebhookCheckService
|
|||||||
$prev = DeviceState::where('device_mac', $mac)->first();
|
$prev = DeviceState::where('device_mac', $mac)->first();
|
||||||
if (! $prev) continue;
|
if (! $prev) continue;
|
||||||
|
|
||||||
// Skip planned reboots — these are intentional, not alerts
|
// Skip planned reboots — these are intentional, not alerts.
|
||||||
|
// Two layers: a global suppression window set by RebootAllAps
|
||||||
|
// (Setting, survives any cache driver), plus the per-MAC
|
||||||
|
// cache keys for finer granularity.
|
||||||
|
if ($this->inGlobalRebootSuppression()) continue;
|
||||||
if (Cache::has('unifi:planned_reboot:' . strtolower($mac))) continue;
|
if (Cache::has('unifi:planned_reboot:' . strtolower($mac))) continue;
|
||||||
|
|
||||||
if ($comingOnline) {
|
if ($comingOnline) {
|
||||||
@@ -509,6 +513,8 @@ class WebhookCheckService
|
|||||||
private function checkReboot($aps, array $filter): array
|
private function checkReboot($aps, array $filter): array
|
||||||
{
|
{
|
||||||
$alerts = [];
|
$alerts = [];
|
||||||
|
if ($this->inGlobalRebootSuppression()) return $alerts;
|
||||||
|
|
||||||
foreach ($aps as $ap) {
|
foreach ($aps as $ap) {
|
||||||
if (! empty($filter) && ! in_array($ap['mac'], $filter)) continue;
|
if (! empty($filter) && ! in_array($ap['mac'], $filter)) continue;
|
||||||
if (Cache::has('unifi:planned_reboot:' . strtolower($ap['mac']))) continue;
|
if (Cache::has('unifi:planned_reboot:' . strtolower($ap['mac']))) continue;
|
||||||
@@ -584,6 +590,24 @@ class WebhookCheckService
|
|||||||
return self::buildPlatformPayload($url, $message, $fullPayload);
|
return self::buildPlatformPayload($url, $message, $fullPayload);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is a fleet reboot in progress right now? RebootAllAps stamps a
|
||||||
|
* suppression-until timestamp as a Setting; while that timestamp
|
||||||
|
* is in the future, we skip all device-offline / device-online /
|
||||||
|
* unexpected-reboot alerts to avoid flooding webhooks during the
|
||||||
|
* known maintenance window.
|
||||||
|
*/
|
||||||
|
private function inGlobalRebootSuppression(): bool
|
||||||
|
{
|
||||||
|
$until = \App\Models\Setting::get('unifi.reboot_suppression_until');
|
||||||
|
if (! $until) return false;
|
||||||
|
try {
|
||||||
|
return \Carbon\Carbon::parse($until)->isFuture();
|
||||||
|
} catch (\Throwable) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Public/static helper so the test-webhook endpoint produces the
|
* Public/static helper so the test-webhook endpoint produces the
|
||||||
* same per-platform payload shape that real events do.
|
* same per-platform payload shape that real events do.
|
||||||
|
|||||||
Reference in New Issue
Block a user