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

service templates - move to blade -wip

Browse Source
This commit is contained in:
Anthony F McInerney
2020-10-14 13:16:42 +01:00
parent 7ec25ac74a
commit 44ac62a069
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Widgets/ServiceTemplateController.php
+1 -1
View File
@@ -54,7 +54,7 @@ class ServiceTemplateController extends Controller
$this->validate($request, [
'service_template_name' => 'required|string|unique:service_templates',
'device_group_id' => 'integer',
'service_template_type' => 'required|in:dynamic,static',
'service_template_type' => 'string',
'service_template_param' => 'string',
'service_template_ip' => 'string',
'service_template_desc' => 'string',
includes/discovery/services.inc.php
+1
View File
@@ -1,6 +1,7 @@
<?php
use LibreNMS\Config;
use App\Models\ServiceTemplate;
if (Config::get('discover_services')) {
// Autodiscover Service Templates
includes/html/forms/discover-service-template.inc.php
+2 -3
View File
@@ -16,10 +16,9 @@ if (! Auth::user()->hasGlobalAdmin()) {
}
$service_template_id = $vars['service_template_id'];
$device_group_id = $vars['device_group_id'];
if (is_numeric($service_template_id) && is_numeric($device_group_id)) {
if (discover_service_template($device_group_id, $service_template_id)) {
if (is_numeric($service_template_id)) {
if (discover_service_template($service_template_id)) {
$status = ['status' =>0, 'message' => 'Services for Service Template: <i>' . $service_template_id . ', have been created or updated.</i>'];
} else {
$status = ['status' =>1, 'message' => 'Services for Service Template: <i>' . $service_template_id . ', have NOT been created or updated.</i>'];
includes/services.inc.php
+2 -2
View File
@@ -166,11 +166,11 @@ function delete_service_template($service_template = null)
return dbDelete('services_template', '`service_template_id` = ?', [$service_template]);
}
function discover_service_template($device_group = null, $service_template = null)
function discover_service_template($service_template = null)
{
$services_template = service_template_get($service_template);
$status = null;
foreach (DB::table('device_group_device')->where('device_group_id', $device_group)->pluck('device_id') as $device) {
foreach (DB::table('device_group_device')->where('device_group_id', $services_template[0]['device_group_id'])->pluck('device_id') as $device) {
foreach (DB::table('services')->where('service_template_id', $service_template)->where('device_id', $device)->where('service_template_changed', '!=', $services_template[0]['service_template_changed'])->pluck('service_id') as $service) {
$update = ['service_desc' => $services_template[0]['service_template_desc'], 'service_ip' => $services_template[0]['service_template_ip'], 'service_param' => $services_template[0]['service_template_param'], 'service_ignore' => $services_template[0]['service_template_ignore'], 'service_disabled' => $services_template[0]['service_template_disabled'], 'service_template_id' => $services_template[0]['service_template_id'], 'service_name' => $services_template[0]['service_template_name'], 'service_template_changed' => $services_template[0]['service_template_changed']];
edit_service($update, $service['service_id']);