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
This commit is contained in:
parent
4b52cab776
commit
4f859cee65
|
@ -351,17 +351,7 @@ function poll_device($device, $force_module = false)
|
||||||
echo "Module [ $module ] disabled globally.\n\n";
|
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)) {
|
if (!$force_module && !empty($graphs)) {
|
||||||
echo "Enabling graphs: ";
|
echo "Enabling graphs: ";
|
||||||
$graphs = collect($graphs)->keys();
|
$graphs = collect($graphs)->keys();
|
||||||
|
|
|
@ -143,6 +143,14 @@ foreach (dbFetch($query) as $device) {
|
||||||
$unreachable_devices++;
|
$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";
|
echo "#### Start Alerts ####\n";
|
||||||
$rules = new AlertRules();
|
$rules = new AlertRules();
|
||||||
$rules->runRules($device['device_id']);
|
$rules->runRules($device['device_id']);
|
||||||
|
|
Loading…
Reference in New Issue