mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Rewritten device groups (including static) (#10295)" (#10340)

Browse Source 
This reverts commit cfc51d51f5.
This commit is contained in:
Tony Murray
2019-06-16 21:52:57 -05:00
committed by GitHub
parent cfc51d51f5
commit c2b09b8f80
36 changed files with 1360 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
includes/html/api_functions.inc.php
View File

@ -12,8 +12,6 @@
* the source code distribution for details.
*/
use App\Models\Device;
use App\Models\DeviceGroup;
use LibreNMS\Alerting\QueryBuilderParser;
use LibreNMS\Authentication\LegacyAuth;
use LibreNMS\Config;
@ -828,7 +826,7 @@ function list_available_health_graphs()
'name' => 'device_'.$graph['sensor_class'],
);
}
$device = Device::find($device_id);
$device = \App\Models\Device::find($device_id);
if ($device) {
if ($device->processors()->count() > 0) {
@ -1822,24 +1820,21 @@ function get_device_groups()
{
$app = \Slim\Slim::getInstance();
$router = $app->router()->getCurrentRoute()->getParams();
if (!empty($router['hostname'])) {
$device = ctype_digit($router['hostname']) ? Device::find($router['hostname']) : Device::findByHostname($router['hostname']);
if (is_null($device)) {
api_error(404, 'Device not found');
}
$query = $device->groups();
$status = 'error';
$code = 404;
$hostname = $router['hostname'];
// use hostname as device_id if it's all digits
$device_id = ctype_digit($hostname) ? $hostname : getidbyname($hostname);
if (is_numeric($device_id)) {
$groups = GetGroupsFromDevice($device_id, 1);
} else {
$query = DeviceGroup::query();
$groups = GetDeviceGroups();
}
$groups = $query->orderBy('name')->get();
if ($groups->isEmpty()) {
if (empty($groups)) {
api_error(404, 'No device groups found');
}
api_success($groups->makeHidden('pivot')->toArray(), 'groups', 'Found ' . $groups->count() . ' device groups');
api_success($groups, 'groups', 'Found ' . count($groups) . ' device groups');
}
function get_devices_by_group()
@ -1847,25 +1842,19 @@ function get_devices_by_group()
check_is_read();
$app = \Slim\Slim::getInstance();
$router = $app->router()->getCurrentRoute()->getParams();
if (empty($router['name'])) {
$name = urldecode($router['name']);
$devices = array();
$full = $_GET['full'];
if (empty($name)) {
api_error(400, 'No device group name provided');
}
$name = urldecode($router['name']);
$device_group = ctype_digit($name) ? DeviceGroup::find($name) : DeviceGroup::where('name', $name)->first();
if (empty($device_group)) {
api_error(404, 'Device group not found');
}
$devices = $device_group->devices()->get(empty($_GET['full']) ? ['devices.device_id'] : ['*']);
if ($devices->isEmpty()) {
$group_id = dbFetchCell("SELECT `id` FROM `device_groups` WHERE `name`=?", array($name));
$devices = GetDevicesFromGroup($group_id, true, $full);
if (empty($devices)) {
api_error(404, 'No devices found in group ' . $name);
}
api_success($devices->makeHidden('pivot')->toArray(), 'devices');
api_success($devices, 'devices');
}
@ -2061,7 +2050,7 @@ function get_fdb()
}
check_device_permission($device_id);
$device = Device::find($device_id);
$device = \App\Models\Device::find($device_id);
if ($device) {
$fdb = $device->portsFdb;
api_success($fdb, 'ports_fdb');