Better services graphing support (#10185)

* Move services graph code from device to service and remove unused code

* Add proper support for services to dashboard graph weidget

* Fix phpdoc in ServiceController still pointing to MuninPluginController
This commit is contained in:
CirnoT
2019-05-13 06:40:27 +02:00
committed by Tony Murray
parent 4313cbfd31
commit ef90da2a31
9 changed files with 88 additions and 27 deletions

View File

@@ -0,0 +1,55 @@
<?php
/**
* ServiceController.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\Service;
class ServiceController extends SelectController
{
/**
* 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)
{
return Service::hasAccess($request->user())
->with(['device' => function ($query) {
$query->select('device_id', 'hostname', 'sysName');
}])
->select('service_id', 'service_type', 'service_desc', 'device_id');
}
public function formatItem($service)
{
return [
'id' => $service->service_id,
'text' => $service->device->shortDisplayName() . ' - ' . $service->service_type . ' (' . $service->service_desc . ')'
];
}
}