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

Solves error in discovering services module (#14939)

Browse Source 
* Solves error discovering services module

* Removing trailing spaces

* Allow in device group scopes to accept an array

* Fix and optimize queries a little

---------

Co-authored-by: Tony Murray <murraytony@gmail.com>
This commit is contained in:
maticomba
2023-04-10 15:26:26 -03:00
committed by GitHub
parent d09c5540ed
commit 6c7fda9833
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/ServiceTemplateController.php
View File

@@ -321,8 +321,8 @@ class ServiceTemplateController extends Controller
ServiceTemplateController::applyDeviceGroups($template); ServiceTemplateController::applyDeviceGroups($template);
// remove any remaining services no longer in the correct device group // remove any remaining services no longer in the correct device group
foreach (Device::notInServiceTemplate($template->id)->notInDeviceGroup($template->groups)->get() as $device) { foreach (Device::notInServiceTemplate($template->id)->notInDeviceGroup($template->groups->pluck('id'))->pluck('device_id') as $device_id) {
Service::where('device_id', $device->device_id)->where('service_template_id', $template->id)->delete(); Service::where('device_id', $device_id)->where('service_template_id', $template->id)->delete();
} }
$msg = __('All Service Templates have been applied'); $msg = __('All Service Templates have been applied');

5
app/Models/Device.php
View File

@@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Relations\MorphToMany; use Illuminate\Database\Eloquent\Relations\MorphToMany;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Arr;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use LibreNMS\Exceptions\InvalidIpException; use LibreNMS\Exceptions\InvalidIpException;
use LibreNMS\Util\IP; use LibreNMS\Util\IP;
@@ -567,7 +568,7 @@ class Device extends BaseModel
$query->qualifyColumn('device_id'), function ($query) use ($deviceGroup) { $query->qualifyColumn('device_id'), function ($query) use ($deviceGroup) {
$query->select('device_id') $query->select('device_id')
->from('device_group_device') ->from('device_group_device')
->where('device_group_id', $deviceGroup); ->whereIn('device_group_id', Arr::wrap($deviceGroup));
} }
); );
} }
@@ -578,7 +579,7 @@ class Device extends BaseModel
$query->qualifyColumn('device_id'), function ($query) use ($deviceGroup) { $query->qualifyColumn('device_id'), function ($query) use ($deviceGroup) {
$query->select('device_id') $query->select('device_id')
->from('device_group_device') ->from('device_group_device')
->where('device_group_id', $deviceGroup); ->whereIn('device_group_id', Arr::wrap($deviceGroup));
} }
); );
} }