mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Dashboard widget update (#9515)
Implemented in Laravel Doesn't use legacy PHP session Several widgets have new features and settings, for example: - Multiple ports in one graph - Maps settings are configurable and override system settings but default to system settings - Graylog stream and/or device selection - Much improved graph widget selection - Many more DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` After you are done testing, you can remove the changes with `./scripts/github-remove`. If there are schema changes, you can ask on discord how to revert.
This commit is contained in:
committed by
Neil Lathwood
parent
dd695dde53
commit
74882e3950
94
app/Http/Controllers/Select/PortController.php
Normal file
94
app/Http/Controllers/Select/PortController.php
Normal file
@@ -0,0 +1,94 @@
|
||||
<?php
|
||||
/**
|
||||
* PortController.php
|
||||
*
|
||||
* -Description-
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* @package LibreNMS
|
||||
* @link http://librenms.org
|
||||
* @copyright 2018 Tony Murray
|
||||
* @author Tony Murray <murraytony@gmail.com>
|
||||
*/
|
||||
|
||||
namespace App\Http\Controllers\Select;
|
||||
|
||||
use App\Models\Port;
|
||||
|
||||
class PortController extends SelectController
|
||||
{
|
||||
/**
|
||||
* Defines validation rules (will override base validation rules for select2 responses too)
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function rules()
|
||||
{
|
||||
return [
|
||||
'device' => 'nullable|int',
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Defines search fields will be searched in order
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return array
|
||||
*/
|
||||
protected function searchFields($request)
|
||||
{
|
||||
return (array)$request->get('field', ['ifAlias', 'ifName', 'ifDescr', 'devices.hostname', 'devices.sysName']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Defines the base query for this resource
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
|
||||
*/
|
||||
protected function baseQuery($request)
|
||||
{
|
||||
/** @var \Illuminate\Database\Eloquent\Builder $query */
|
||||
$query = Port::hasAccess($request->user())
|
||||
->with(['device' => function ($query) {
|
||||
$query->select('device_id', 'hostname', 'sysName');
|
||||
}])
|
||||
->select('ports.device_id', 'port_id', 'ifAlias', 'ifName', 'ifDescr')
|
||||
->groupBy(['ports.device_id', 'port_id', 'ifAlias', 'ifName', 'ifDescr']);
|
||||
|
||||
if ($request->get('term')) {
|
||||
// join with devices for searches
|
||||
$query->leftJoin('devices', 'devices.device_id', 'ports.device_id');
|
||||
}
|
||||
|
||||
if ($device_id = $request->get('device')) {
|
||||
$query->where('ports.device_id', $device_id);
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
|
||||
public function formatItem($port)
|
||||
{
|
||||
/** @var Port $port */
|
||||
$label = $port->getShortLabel();
|
||||
$description = ($label == $port->ifAlias ? '' : ' - ' . $port->ifAlias);
|
||||
|
||||
return [
|
||||
'id' => $port->port_id,
|
||||
'text' => $label . ' - ' . $port->device->shortDisplayName() . $description,
|
||||
];
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user