Logs enhancements

app/ApiClients/GraylogApi.php

@@ -66,10 +66,16 @@ public function getStreams(): array
     }
 
     /**
-     * Query the Graylog server
+     * Query the Graylog server relative time
      */
-    public function query(string $query = '*', int $range = 0, int $limit = 0, int $offset = 0, ?string $sort = null, ?string $filter = null): array
-    {
+    public function queryRelative(
+        string $query = '*',
+        int $range = 0,
+        int $limit = 0,
+        int $offset = 0,
+        ?string $sort = null,
+        ?string $filter = null
+    ): array {
         if (! $this->isConfigured()) {
             return [];
         }
@@ -93,6 +99,39 @@ public function query(string $query = '*', int $range = 0, int $limit = 0, int $
         return $response->json() ?: [];
     }
 
+    /**
+     * Query the Graylog server absolute time
+     */
+    public function queryAbsolute(
+        string $query = '*',
+        string $from = '',
+        string $to = '',
+        int $limit = 0,
+        int $offset = 0,
+        ?string $sort = null,
+        ?string $filter = null
+    ): array {
+        if (! $this->isConfigured()) {
+            return [];
+        }
+
+        $uri = $this->api_prefix . '/search/universal/absolute';
+
+        $data = [
+            'query' => $query,
+            'from' => $from,
+            'to' => $to,
+            'limit' => $limit,
+            'offset' => $offset,
+            'sort' => $sort,
+            'filter' => $filter,
+        ];
+
+        $response = $this->client->get($uri, $data)->throw();
+
+        return $response->json() ?: [];
+    }
+
     /**
      * Build a simple query string that searches the messages field and/or filters by device
      */

app/Http/Controllers/Device/Tabs/EventlogController.php

@@ -26,9 +26,11 @@
 
 namespace App\Http\Controllers\Device\Tabs;
 
+use App\Facades\LibrenmsConfig;
 use App\Http\Controllers\Controller;
 use App\Models\Device;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 use Illuminate\View\View;
 
 class EventlogController extends Controller
@@ -37,12 +39,33 @@ public function __invoke(Device $device, Request $request): View
     {
         $request->validate([
             'eventtype' => 'nullable|string',
+            'device' => 'nullable|int',
+            'from' => 'nullable|string',
+            'to' => 'nullable|string',
         ]);
+        $eventlog_filter = [
+            'field' => 'type',
+            'device' => $device->device_id,
+        ];
 
+        $format = LibrenmsConfig::get('dateformat.byminute', 'Y-m-d H:i');
+        $now = Carbon::now();
+        $defaultFrom = (clone $now)->subDays(7);
+        $fromInput = $request->input('from');
+        $toInput = $request->input('to');
+
+        if (empty($fromInput) && empty($toInput)) {
+            $fromInput = $defaultFrom->format($format);
+            $toInput = $now->format($format);
+        }
         return view('device.tabs.logs.eventlog', [
-            'device' => $device,
-            'filter_device' => false,
+            'now' => $now->format($format),
+            'default_date' => $defaultFrom->format($format),
             'eventtype' => $request->input('eventtype', ''),
+            'from' => $fromInput,
+            'to' => $toInput,
+            'device' => $device,
+            'eventlog_filter' => $eventlog_filter,
         ]);
     }
 }

app/Http/Controllers/Device/Tabs/GraylogController.php

@@ -29,6 +29,7 @@
 use App\Facades\LibrenmsConfig;
 use App\Http\Controllers\Controller;
 use App\Models\Device;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
 
@@ -40,7 +41,24 @@ public function __invoke(Device $device, Request $request): View
             'stream' => 'nullable|string',
             'range' => 'nullable|int',
             'loglevel' => 'nullable|int',
+            'to' => 'nullable|string',
+            'level' => 'nullable|string',
         ]);
+        $graylog_filter = [
+            'field' => 'stream',
+            'device' => $device->device_id,
+        ];
+
+        $format = LibrenmsConfig::get('dateformat.byminute', 'Y-m-d H:i');
+        $now = Carbon::now();
+        $defaultFrom = (clone $now)->subDays(7);
+        $fromInput = $request->input('from');
+        $toInput = $request->input('to');
+
+        if (empty($fromInput) && empty($toInput)) {
+            $fromInput = $defaultFrom->format($format);
+            $toInput = $now->format($format);
+        }
 
         return view('device.tabs.logs.graylog', [
             'device' => $device,
@@ -50,6 +68,11 @@ public function __invoke(Device $device, Request $request): View
             'stream' => $request->input('stream', ''),
             'range' => $request->input('range', '0'),
             'loglevel' => $request->input('loglevel', ''),
+            'from' => $fromInput,
+            'to' => $toInput,
+            'default_date' => $defaultFrom->format($format),
+            'now' => $now->format($format),
+            'graylog_filter' => $graylog_filter,
         ]);
     }
 }

app/Http/Controllers/Device/Tabs/SyslogController.php

@@ -40,19 +40,41 @@ public function __invoke(Device $device, Request $request): View
         $request->validate([
             'program' => 'nullable|string',
             'priority' => 'nullable|string',
+            'device' => 'nullable|int',
             'from' => 'nullable|string',
             'to' => 'nullable|string',
+            'level' => 'nullable|string',
         ]);
+        $syslog_program_filter = [
+            'field' => 'program',
+            'device' => $device->device_id,
+        ];
+        $syslog_priority_filter = [
+            'field' => 'priority',
+            'device' => $device->device_id,
+        ];
+
+        $format = LibrenmsConfig::get('dateformat.byminute', 'Y-m-d H:i');
+        $now = Carbon::now();
+        $defaultFrom = (clone $now)->subDays(7);
+        $fromInput = $request->input('from');
+        $toInput = $request->input('to');
+
+        if (empty($fromInput) && empty($toInput)) {
+            $fromInput = $defaultFrom->format($format);
+            $toInput = $now->format($format);
+        }
 
         return view('device.tabs.logs.syslog', [
             'device' => $device,
-            'filter_device' => false,
-            'now' => Carbon::now()->format(LibrenmsConfig::get('dateformat.byminute', 'Y-m-d H:i')),
-            'default_date' => Carbon::now()->subDay()->format(LibrenmsConfig::get('dateformat.byminute', 'Y-m-d H:i')),
+            'now' => $now->format($format),
+            'default_date' => $defaultFrom->format($format),
             'program' => $request->input('program', ''),
             'priority' => $request->input('priority', ''),
-            'from' => $request->input('from', ''),
-            'to' => $request->input('to', ''),
+            'from' => $fromInput,
+            'to' => $toInput,
+            'syslog_program_filter' => $syslog_program_filter,
+            'syslog_priority_filter' => $syslog_priority_filter,
         ]);
     }
 }

app/Http/Controllers/EventlogController.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Facades\LibrenmsConfig;
+use App\Http\Controllers\Controller;
+use App\Models\Device;
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Illuminate\View\View;
+
+class EventlogController extends Controller
+{
+    public function __invoke(Request $request): View
+    {
+        $this->validate($request, [
+            'eventtype' => 'nullable|string',
+            'device' => 'nullable|int',
+            'from' => 'nullable|string',
+            'to' => 'nullable|string',
+        ]);
+
+        $device = \App\Models\Device::hasAccess($request->user())
+            ->select(['device_id', 'hostname', 'ip', 'sysName', 'display'])
+            ->firstWhere('device_id', $request->input('device'));
+
+        $eventlog_filter = ['field' => 'type'];
+        $device_selected = '';
+        if ($device) {
+            $device_selected = ['id' => $device->device_id, 'text' => $device->displayName()];
+            $eventlog_filter['device'] = $device->device_id;
+        }
+
+        $format = LibrenmsConfig::get('dateformat.byminute', 'Y-m-d H:i');
+        $now = Carbon::now();
+        $defaultFrom = (clone $now)->subDays(1);
+        $fromInput = $request->input('from');
+        $toInput = $request->input('to');
+
+        if (empty($fromInput) && empty($toInput)) {
+            $fromInput = $defaultFrom->format($format);
+            $toInput = $now->format($format);
+        }
+        return view('eventlog', [
+            'device' => $device_selected,
+            'filter' => [
+                'now' => $now->format($format),
+                'default_date' => $defaultFrom->format($format),
+                'eventtype' => $request->input('eventtype', ''),
+                'from' => $fromInput,
+                'to' => $toInput,
+                'device' => $device?->device_id,
+            ],
+            'eventlog_filter' => $eventlog_filter,
+        ]);
+    }
+}

app/Http/Controllers/GraylogController.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Facades\LibrenmsConfig;
+use App\Http\Controllers\Controller;
+use App\Models\Device;
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Illuminate\View\View;
+
+class GraylogController extends Controller
+{
+    public function __invoke(Request $request): View
+    {
+        $request->validate([
+            'stream' => 'nullable|string',
+            'device' => 'nullable|int',
+            'range' => 'nullable|int',
+            'loglevel' => 'nullable|int',
+            'to' => 'nullable|string',
+            'level' => 'nullable|string',
+        ]);
+
+        $device = \App\Models\Device::hasAccess($request->user())
+            ->select(['device_id', 'hostname', 'ip', 'sysName', 'display'])
+            ->firstWhere('device_id', $request->input('device'));
+
+        $graylog_filter = ['field' => 'stream',];
+        $device_selected = '';
+        if ($device) {
+            $device_selected = ['id' => $device->device_id, 'text' => $device->displayName()];
+            $graylog_filter['device'] = $device->device_id;
+        }
+
+        $format = LibrenmsConfig::get('dateformat.byminute', 'Y-m-d H:i');
+        $now = Carbon::now();
+        $defaultFrom = (clone $now)->subDays(1);
+        $fromInput = $request->input('from');
+        $toInput = $request->input('to');
+
+        if (empty($fromInput) && empty($toInput)) {
+            $fromInput = $defaultFrom->format($format);
+            $toInput = $now->format($format);
+        }
+
+        return view('graylog', [
+            'device' => $device_selected,
+            'filter' => [
+                'timezone' => LibrenmsConfig::has('graylog.timezone'),
+                'filter_device' => true,
+                'show_form' => true,
+                'stream' => $request->input('stream', ''),
+                'range' => $request->input('range', '0'),
+                'loglevel' => $request->input('loglevel', ''),
+                'from' => $fromInput,
+                'to' => $toInput,
+                'default_date' => $defaultFrom->format($format),
+                'now' => $now->format($format),
+            ],
+            'graylog_filter' => $graylog_filter,
+        ]);
+    }
+}

app/Http/Controllers/SyslogController.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Facades\LibrenmsConfig;
+use App\Http\Controllers\Controller;
+use App\Models\Device;
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Illuminate\View\View;
+
+class SyslogController extends Controller
+{
+    public function __invoke(Request $request): View
+    {
+        $request->validate([
+            'program' => 'nullable|string',
+            'priority' => 'nullable|string',
+            'device' => 'nullable|int',
+            'from' => 'nullable|string',
+            'to' => 'nullable|string',
+            'level' => 'nullable|string',
+        ]);
+
+        $device = \App\Models\Device::hasAccess($request->user())
+            ->select(['device_id', 'hostname', 'ip', 'sysName', 'display'])
+            ->firstWhere('device_id', $request->input('device'));
+
+        $syslog_program_filter = ['field' => 'program'];
+        $syslog_priority_filter = ['field' => 'priority'];
+        $device_selected = '';
+        if ($device) {
+            $device_selected = ['id' => $device->device_id, 'text' => $device->displayName()];
+            $syslog_program_filter['device'] = $device->device_id;
+            $syslog_priority_filter['device'] = $device->device_id;
+        }
+
+        $format = LibrenmsConfig::get('dateformat.byminute', 'Y-m-d H:i');
+        $now = Carbon::now();
+        $defaultFrom = (clone $now)->subDays(1);
+        $fromInput = $request->input('from');
+        $toInput = $request->input('to');
+
+        if (empty($fromInput) && empty($toInput)) {
+            $fromInput = $defaultFrom->format($format);
+            $toInput = $now->format($format);
+        }
+
+        return view('syslog', [
+            'device' => $device_selected,
+            'filter' => [
+                'device' => $device,
+                'filter_device' => false,
+                'now' => $now->format($format),
+                'default_date' => $defaultFrom->format($format),
+                'program' => $request->input('program', ''),
+                'priority' => $request->input('priority', ''),
+                'from' => $fromInput,
+                'to' => $toInput,
+            ],
+            'syslog_program_filter' => $syslog_program_filter,
+            'syslog_priority_filter' => $syslog_priority_filter,
+        ]);
+    }
+}