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

Adding device's field in get_alert_rule and list-alert-rules API function (new) (#14481)

Browse Source 
* Adding device's field in get_alert_rule and lis-alert-rules API function

* Converting SQL request for list/get_alert_rules to Eloquent (thanks a lot to Murrant)

* Manually added #14500 to pass pipeline

* Fixing StyleCI error + trying to fix PHPStan errors

* Trying to fix PHPStan errors (part 2)
This commit is contained in:
geg347
2022-11-09 15:21:41 +01:00
committed by GitHub
parent b9d8a7c33c
commit 96c7e7166e
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Http/Resources/AlertRule.php Normal file
View File

@@ -0,0 +1,29 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
/**
* @property \App\Models\Device $devices
* @property \App\Models\DeviceGroup $groups
* @property \App\Models\Location $locations
*/
class AlertRule extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
*/
public function toArray($request)
{
$rule = parent::toArray($request);
$rule['devices'] = $this->devices->pluck('device_id')->all();
$rule['groups'] = $this->groups->pluck('id')->all();
$rule['locations'] = $this->locations->pluck('id')->all();
return $rule;
}
}

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

@@ -1140,16 +1140,13 @@ function update_device_port_notes(Illuminate\Http\Request $request): \Illuminate
function list_alert_rules(Illuminate\Http\Request $request)
{
$id = $request->route('id');
$sql = '';
$param = [];
if ($id > 0) {
$sql = 'WHERE id=?';
$param = [$id];
}
$rules = dbFetchRows("SELECT * FROM `alert_rules` $sql", $param);
$rules = \App\Http\Resources\AlertRule::collection(
\App\Models\AlertRule::when($id, fn ($query) => $query->where('id', $id))
->with(['devices:device_id', 'groups:id', 'locations:id'])->get()
);
return api_success($rules, 'rules');
return api_success($rules->toArray($request), 'rules');
}
function list_alerts(Illuminate\Http\Request $request)