mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
highlight isolated Devices (Devices with no Dependencies) (#11018)
* highlight isolated Devices (no Dependencies) * travis fix * retrigger node analysis
This commit is contained in:
committed by
Kevin Krumm
parent
65106e20e7
commit
f40f4e1864
@@ -31,6 +31,9 @@ use LibreNMS\Util\Url;
|
|||||||
|
|
||||||
class DeviceDependencyController extends MapController
|
class DeviceDependencyController extends MapController
|
||||||
{
|
{
|
||||||
|
|
||||||
|
protected $isolated_device_id = -1;
|
||||||
|
|
||||||
protected static function deviceList($request)
|
protected static function deviceList($request)
|
||||||
{
|
{
|
||||||
$group_id = $request->get('group');
|
$group_id = $request->get('group');
|
||||||
@@ -53,6 +56,20 @@ class DeviceDependencyController extends MapController
|
|||||||
return $devices->merge($devices->map->only('children', 'parents')->flatten())->loadMissing('parents', 'location');
|
return $devices->merge($devices->map->only('children', 'parents')->flatten())->loadMissing('parents', 'location');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function highlightIsolatedDevices($devices_by_id, $isolated_device_ids)
|
||||||
|
{
|
||||||
|
$new_device_list = [];
|
||||||
|
foreach ($devices_by_id as $device) {
|
||||||
|
if (in_array($device['id'], $isolated_device_ids)) {
|
||||||
|
$new_device_list[] = array_merge($device, $this->nodeHighlightStyle());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$new_device_list[] = $device;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $new_device_list;
|
||||||
|
}
|
||||||
|
|
||||||
// Device Dependency Map
|
// Device Dependency Map
|
||||||
public function dependencyMap(Request $request)
|
public function dependencyMap(Request $request)
|
||||||
{
|
{
|
||||||
@@ -60,12 +77,17 @@ class DeviceDependencyController extends MapController
|
|||||||
$highlight_node = $request->get('highlight_node');
|
$highlight_node = $request->get('highlight_node');
|
||||||
|
|
||||||
$dependencies = [];
|
$dependencies = [];
|
||||||
$devices_by_id = [];
|
$devices_by_id = [];
|
||||||
$device_list = [];
|
$device_list = [];
|
||||||
|
|
||||||
|
// collect Device IDs and Parents/Children to find isolated Devices
|
||||||
|
$device_id_all = [];
|
||||||
|
$device_associations = [];
|
||||||
|
|
||||||
// List all devices
|
// List all devices
|
||||||
foreach (self::deviceList($request) as $device) {
|
foreach (self::deviceList($request) as $device) {
|
||||||
$device_list[] = ['id' => $device->device_id, 'label' => $device->hostname];
|
$device_list[] = ['id' => $device->device_id, 'label' => $device->hostname];
|
||||||
|
$device_id_all[] = $device->device_id;
|
||||||
|
|
||||||
// List all Device
|
// List all Device
|
||||||
$devices_by_id[] = array_merge(
|
$devices_by_id[] = array_merge(
|
||||||
@@ -79,8 +101,14 @@ class DeviceDependencyController extends MapController
|
|||||||
);
|
);
|
||||||
|
|
||||||
// List all Device Dependencies
|
// List all Device Dependencies
|
||||||
|
$children = $device->children;
|
||||||
|
foreach ($children as $child) {
|
||||||
|
$device_associations[] = $child->device_id;
|
||||||
|
}
|
||||||
|
|
||||||
$parents = $device->parents;
|
$parents = $device->parents;
|
||||||
foreach ($parents as $parent) {
|
foreach ($parents as $parent) {
|
||||||
|
$device_associations[] = $parent->device_id;
|
||||||
$dependencies[] = [
|
$dependencies[] = [
|
||||||
'from' => $device->device_id,
|
'from' => $device->device_id,
|
||||||
'to' => $parent->device_id,
|
'to' => $parent->device_id,
|
||||||
@@ -89,9 +117,18 @@ class DeviceDependencyController extends MapController
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// highlight isolated Devices
|
||||||
|
if ($highlight_node == $this->isolated_device_id) {
|
||||||
|
$device_associations = array_unique($device_associations);
|
||||||
|
$isolated_device_ids = array_diff($device_id_all, $device_associations);
|
||||||
|
|
||||||
|
$devices_by_id = $this->highlightIsolatedDevices($devices_by_id, $isolated_device_ids);
|
||||||
|
}
|
||||||
|
|
||||||
array_multisort(array_column($device_list, 'label'), SORT_ASC, $device_list);
|
array_multisort(array_column($device_list, 'label'), SORT_ASC, $device_list);
|
||||||
|
|
||||||
$data = [
|
$data = [
|
||||||
|
'isolated_device_id' => $this->isolated_device_id,
|
||||||
'device_list' => $device_list,
|
'device_list' => $device_list,
|
||||||
'group_id' => $group_id,
|
'group_id' => $group_id,
|
||||||
'highlight_node' => $highlight_node,
|
'highlight_node' => $highlight_node,
|
||||||
|
@@ -8,6 +8,7 @@
|
|||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
<select name="highlight_node" id="highlight_node" class="input-sm" onChange="highlightNode()";>
|
<select name="highlight_node" id="highlight_node" class="input-sm" onChange="highlightNode()";>
|
||||||
<option value="0">None</option>
|
<option value="0">None</option>
|
||||||
|
<option value="{{ $isolated_device_id }}">@lang('Isolated Devices')</option>
|
||||||
@foreach($device_list as $device)
|
@foreach($device_list as $device)
|
||||||
<option value="{{ $device['id'] }}">{{ $device['label'] }}</option>
|
<option value="{{ $device['id'] }}">{{ $device['label'] }}</option>
|
||||||
@endforeach
|
@endforeach
|
||||||
|
Reference in New Issue
Block a user