From 4f859cee6525260a0e55a1b24bd8e8eb622c467d Mon Sep 17 00:00:00 2001 From: Albert Siersema Date: Sun, 31 May 2020 01:23:31 +0200 Subject: [PATCH] Fix dynamic group membership rule for devices.status equal 0 (#11699) * Fix dynamic group membership rule for devices.status equal 0 * Fix dynamic group membership rule for devices.status equal 0 - moved code to right before running alerts --- includes/polling/functions.inc.php | 12 +----------- poller.php | 8 ++++++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php index 3025c6fe87..bd49f010d2 100644 --- a/includes/polling/functions.inc.php +++ b/includes/polling/functions.inc.php @@ -351,17 +351,7 @@ function poll_device($device, $force_module = false) echo "Module [ $module ] disabled globally.\n\n"; } } - - // Update device_groups - echo "### Start Device Groups ###\n"; - $dg_start = microtime(true); - - $group_changes = \App\Models\DeviceGroup::updateGroupsFor($device['device_id']); - d_echo("Groups Added: " . implode(',', $group_changes['attached']) . PHP_EOL); - d_echo("Groups Removed: " . implode(',', $group_changes['detached']) . PHP_EOL); - - echo "### End Device Groups, runtime: " . round(microtime(true) - $dg_start, 4) . "s ### \n\n"; - + if (!$force_module && !empty($graphs)) { echo "Enabling graphs: "; $graphs = collect($graphs)->keys(); diff --git a/poller.php b/poller.php index c158987866..b5f7a322bb 100755 --- a/poller.php +++ b/poller.php @@ -143,6 +143,14 @@ foreach (dbFetch($query) as $device) { $unreachable_devices++; } + // Update device_groups + echo "### Start Device Groups ###\n"; + $dg_start = microtime(true); + $group_changes = \App\Models\DeviceGroup::updateGroupsFor($device['device_id']); + d_echo("Groups Added: " . implode(',', $group_changes['attached']) . PHP_EOL); + d_echo("Groups Removed: " . implode(',', $group_changes['detached']) . PHP_EOL); + echo "### End Device Groups, runtime: " . round(microtime(true) - $dg_start, 4) . "s ### \n\n"; + echo "#### Start Alerts ####\n"; $rules = new AlertRules(); $rules->runRules($device['device_id']);