mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Rewritten device groups (including static) (#10295)
* Device Groups rewrite Updated web ui Static or dynamic groups allowed Alert rule query builder Translation support Permissions support * cleanup, make relationship save, and validate it * builder WIP * rules builder and rules saving/loading * Parse query builder to Laravel Fluent query * Upgrade existing groups when editing. Properly update only dynamic groups when polling. * remove unused old code Update API and other places to use Eloquent * debug output in poller restored * Fix up some things creating static improved validation fix js error on creation Fix static groups in polling * hide pattern for static group * Implement authorization Use in the menu too * update schema * fix rollback * Don't abort on invalid queries * fixes to query builder * add test data, looks like macros aren't handled (omitted them because groups don't use them generally) * Add macro support for QueryBuilderFluentParser * add test for macro that accepts value * More space in forms Retain rules when converted to static no duplicate names allowed * Better error feedback Update related devices on save * Add button icon * format * update docs * fix tests
This commit is contained in:
Tony Murray
GitHub
173
app/Http/Controllers/DeviceGroupController.php
Normal file
173
app/Http/Controllers/DeviceGroupController.php
Normal file
@@ -0,0 +1,173 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\DeviceGroup;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\Http\Request;
|
||||
use LibreNMS\Alerting\QueryBuilderFilter;
|
||||
use LibreNMS\Alerting\QueryBuilderFluentParser;
|
||||
use Toastr;
|
||||
|
||||
class DeviceGroupController extends Controller
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
$this->authorizeResource(DeviceGroup::class, 'device_group');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
$this->authorize('manage', DeviceGroup::class);
|
||||
|
||||
return view('device-group.index', [
|
||||
'device_groups' => DeviceGroup::orderBy('name')->withCount('devices')->get(),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for creating a new resource.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function create()
|
||||
{
|
||||
return view('device-group.create', [
|
||||
'device_group' => new DeviceGroup(),
|
||||
'filters' => json_encode(new QueryBuilderFilter('group')),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$this->validate($request, [
|
||||
'name' => 'required|string|unique:device_groups',
|
||||
'type' => 'required|in:dynamic,static',
|
||||
'devices' => 'array|required_if:type,static',
|
||||
'devices.*' => 'integer',
|
||||
'rules' => 'json|required_if:type,dynamic',
|
||||
]);
|
||||
|
||||
$deviceGroup = DeviceGroup::make($request->only(['name', 'desc', 'type']));
|
||||
$deviceGroup->rules = json_decode($request->rules);
|
||||
$deviceGroup->save();
|
||||
|
||||
if ($request->type == 'static') {
|
||||
$deviceGroup->devices()->sync($request->devices);
|
||||
}
|
||||
|
||||
Toastr::success(__('Device Group :name created', ['name' => $deviceGroup->name]));
|
||||
|
||||
return redirect()->route('device-groups.index');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\DeviceGroup $deviceGroup
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(DeviceGroup $deviceGroup)
|
||||
{
|
||||
return redirect(url('/devices/group=' . $deviceGroup->id));
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\DeviceGroup $deviceGroup
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(DeviceGroup $deviceGroup)
|
||||
{
|
||||
// convert old rules on edit
|
||||
if (is_null($deviceGroup->rules)) {
|
||||
$query_builder = QueryBuilderFluentParser::fromOld($deviceGroup->pattern);
|
||||
$deviceGroup->rules = $query_builder->toArray();
|
||||
}
|
||||
|
||||
return view('device-group.edit', [
|
||||
'device_group' => $deviceGroup,
|
||||
'filters' => json_encode(new QueryBuilderFilter('group')),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Models\DeviceGroup $deviceGroup
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, DeviceGroup $deviceGroup)
|
||||
{
|
||||
$this->validate($request, [
|
||||
'name' => [
|
||||
'required',
|
||||
'string',
|
||||
Rule::unique('device_groups')->where(function ($query) use ($deviceGroup) {
|
||||
$query->where('id', '!=', $deviceGroup->id);
|
||||
}),
|
||||
],
|
||||
'type' => 'required|in:dynamic,static',
|
||||
'devices' => 'array|required_if:type,static',
|
||||
'devices.*' => 'integer',
|
||||
'rules' => 'json|required_if:type,dynamic',
|
||||
]);
|
||||
|
||||
$deviceGroup->fill($request->only(['name', 'desc', 'type']));
|
||||
|
||||
$devices_updated = false;
|
||||
if ($deviceGroup->type == 'static') {
|
||||
// sync device_ids from input
|
||||
$devices_updated = array_sum($deviceGroup->devices()->sync($request->get('devices', [])));
|
||||
} else {
|
||||
$deviceGroup->rules = json_decode($request->rules);
|
||||
}
|
||||
|
||||
if ($deviceGroup->isDirty() || $devices_updated) {
|
||||
try {
|
||||
if ($deviceGroup->save() || $devices_updated) {
|
||||
Toastr::success(__('Device Group :name updated', ['name' => $deviceGroup->name]));
|
||||
} else {
|
||||
Toastr::error(__('Failed to save'));
|
||||
return redirect()->back()->withInput();
|
||||
}
|
||||
} catch (\Illuminate\Database\QueryException $e) {
|
||||
return redirect()->back()->withInput()->withErrors([
|
||||
'rules' => __('Rules resulted in invalid query: ') . $e->getMessage()
|
||||
]);
|
||||
}
|
||||
} else {
|
||||
Toastr::info(__('No changes made'));
|
||||
}
|
||||
|
||||
return redirect()->route('device-groups.index');
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Models\DeviceGroup $deviceGroup
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(DeviceGroup $deviceGroup)
|
||||
{
|
||||
$deviceGroup->delete();
|
||||
|
||||
Toastr::success(__('Device Group :name deleted', ['name' => $deviceGroup->name]));
|
||||
|
||||
return redirect()->route('device-groups.index');
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user