Update Eventlog WebUI/backend to use ajax (#9252)

* WIP Eventlog table

* Initial Eventlog rework

* fromdevice is not a request parameter

* updates

* remove unneeded field

* Cleanups

LibreNMS/Util/Rewrite.php

@@ -0,0 +1,110 @@
+<?php
+/**
+ * Rewrite.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2018 Tony Murray
+ * @author     Tony Murray <murraytony@gmail.com>
+ */
+
+namespace LibreNMS\Util;
+
+class Rewrite
+{
+    public static function normalizeIfType($type)
+    {
+        $rewrite_iftype = [
+            'frameRelay'             => 'Frame Relay',
+            'ethernetCsmacd'         => 'Ethernet',
+            'softwareLoopback'       => 'Loopback',
+            'tunnel'                 => 'Tunnel',
+            'propVirtual'            => 'Virtual Int',
+            'ppp'                    => 'PPP',
+            'ds1'                    => 'DS1',
+            'pos'                    => 'POS',
+            'sonet'                  => 'SONET',
+            'slip'                   => 'SLIP',
+            'mpls'                   => 'MPLS Layer',
+            'l2vlan'                 => 'VLAN Subif',
+            'atm'                    => 'ATM',
+            'aal5'                   => 'ATM AAL5',
+            'atmSubInterface'        => 'ATM Subif',
+            'propPointToPointSerial' => 'PtP Serial',
+        ];
+
+        if (isset($rewrite_iftype[$type])) {
+            return $rewrite_iftype[$type];
+        }
+
+        return $type;
+    }
+
+    public static function normalizeIfName($name)
+    {
+        $rewrite_ifname = [
+            'ether'                                          => 'Ether',
+            'gig'                                            => 'Gig',
+            'fast'                                           => 'Fast',
+            'ten'                                            => 'Ten',
+            '-802.1q vlan subif'                             => '',
+            '-802.1q'                                        => '',
+            'bvi'                                            => 'BVI',
+            'vlan'                                           => 'Vlan',
+            'tunnel'                                         => 'Tunnel',
+            'serial'                                         => 'Serial',
+            '-aal5 layer'                                    => ' aal5',
+            'null'                                           => 'Null',
+            'atm'                                            => 'ATM',
+            'port-channel'                                   => 'Port-Channel',
+            'dial'                                           => 'Dial',
+            'hp procurve switch software loopback interface' => 'Loopback Interface',
+            'control plane interface'                        => 'Control Plane',
+            'loop'                                           => 'Loop',
+            'bundle-ether'                                   => 'Bundle-Ether',
+        ];
+
+        return str_ireplace(array_keys($rewrite_ifname), array_values($rewrite_ifname), $name);
+    }
+
+    public static function shortenIfName($name)
+    {
+        $rewrite_shortif = [
+            'tengigabitethernet'  => 'Te',
+            'ten-gigabitethernet' => 'Te',
+            'tengige'             => 'Te',
+            'gigabitethernet'     => 'Gi',
+            'fastethernet'        => 'Fa',
+            'ethernet'            => 'Et',
+            'serial'              => 'Se',
+            'pos'                 => 'Pos',
+            'port-channel'        => 'Po',
+            'atm'                 => 'Atm',
+            'null'                => 'Null',
+            'loopback'            => 'Lo',
+            'dialer'              => 'Di',
+            'vlan'                => 'Vlan',
+            'tunnel'              => 'Tunnel',
+            'serviceinstance'     => 'SI',
+            'dwdm'                => 'DWDM',
+            'bundle-ether'        => 'BE',
+        ];
+
+        return str_ireplace(array_keys($rewrite_shortif), array_values($rewrite_shortif), $name);
+    }
+}

LibreNMS/Util/Url.php

@@ -26,6 +26,7 @@
 namespace LibreNMS\Util;
 
 use App\Models\Device;
+use App\Models\Port;
 use Auth;
 use Carbon\Carbon;
 use LibreNMS\Config;
@@ -106,18 +107,76 @@ class Url
             $link = Url::overlibLink($url, $text, $contents, $class);
         }
 
-        if (Auth::user()->hasGlobalRead() || $device->users()->where('devices_perms.user_id', Auth::id())->exists()) {
+        if ($device->canAccess(Auth::user())) {
             return $link;
         } else {
             return $device->displayName();
         }
     }
 
+    /**
+     * @param Port $port
+     * @param string $text
+     * @param string $type
+     * @param boolean $overlib
+     * @param boolean $single_graph
+     * @return mixed|string
+     */
+    public static function portLink($port, $text = null, $type = null, $overlib = true, $single_graph = false)
+    {
+
+        $label = Rewrite::normalizeIfName($port->getLabel());
+        if (!$text) {
+            $text = $label;
+        }
+
+        $content = '<div class=list-large>' . addslashes(htmlentities($port->device->displayName() . ' - ' . $label)) . '</div>';
+        if ($port->ifAlias) {
+            $content .= addslashes(htmlentities($port->ifAlias)) . '<br />';
+        }
+
+        $content .= "<div style=\'width: 850px\'>";
+        $graph_array = [
+            'type' => $type ?: 'port_bits',
+            'legend' => 'yes',
+            'height' => 100,
+            'width' => 340,
+            'to' => Carbon::now()->timestamp,
+            'from' => Carbon::now()->subDay()->timestamp,
+            'id' => $port->port_id,
+        ];
+
+        $content .= self::graphTag($graph_array);
+        if (!$single_graph) {
+            $graph_array['from'] = Carbon::now()->subWeek()->timestamp;
+            $content .= self::graphTag($graph_array);
+            $graph_array['from'] = Carbon::now()->subMonth()->timestamp;
+            $content .= self::graphTag($graph_array);
+            $graph_array['from'] = Carbon::now()->subYear()->timestamp;
+            $content .= self::graphTag($graph_array);
+        }
+
+        $content .= '</div>';
+
+        if (!$overlib) {
+            return $content;
+        } elseif ($port->canAccess(Auth::user())) {
+            return self::overlibLink(self::portUrl($port), $text, $content, self::portLinkDisplayClass($port));
+        }
+
+        return Rewrite::normalizeIfName($text);
+    }
+
     public static function deviceUrl($device, $vars = [])
     {
         return self::generate(['page' => 'device', 'device' => $device->device_id], $vars);
     }
 
+    public static function portUrl($port, $vars = [])
+    {
+        return self::generate(['page' => 'device', 'device' => $port->device_id, 'tab' => 'port', 'port' => $port->port_id], $vars);
+    }
+
     public static function generate($vars, $new_vars = [])
     {
         $vars = array_merge($vars, $new_vars);
@@ -134,6 +193,20 @@ class Url
         return $url;
     }
 
+    /**
+     * @param array $args
+     * @return string
+     */
+    public static function graphTag($args)
+    {
+        $urlargs = [];
+        foreach ($args as $key => $arg) {
+            $urlargs[] = $key . '=' . urlencode($arg);
+        }
+
+        return '<img src="graph.php?' . implode('&amp;', $urlargs) . '" border="0" />';
+    }
+
     public static function overlibLink($url, $text, $contents, $class = null)
     {
         $contents = "<div style=\'background-color: #FFFFFF;\'>" . $contents . '</div>';
@@ -213,4 +286,17 @@ class Url
 
         return $device->status ? 'list-device' : 'list-device-down';
     }
+
+    private static function portLinkDisplayClass($port)
+    {
+        if ($port->ifAdminStatus == "down") {
+            return "interface-admindown";
+        }
+
+        if ($port->ifAdminStatus == "up" && $port->ifOperStatus == "down") {
+            return "interface-updown";
+        }
+
+        return "interface-upup";
+    }
 }

app/Http/Controllers/Select/EventlogController.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * EventlogController.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2018 Tony Murray
+ * @author     Tony Murray <murraytony@gmail.com>
+ */
+
+namespace App\Http\Controllers\Select;
+
+use App\Models\Eventlog;
+
+class EventlogController extends SelectController
+{
+    /**
+     * Defines validation rules (will override base validation rules for select2 responses too)
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'field' => 'required|in:type',
+            'device' => 'nullable|int',
+        ];
+    }
+
+    /**
+     * Defines search fields will be searched in order
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return array
+     */
+    public function searchFields($request)
+    {
+        return [$request->get('field')];
+    }
+
+    /**
+     * Defines the base query for this resource
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
+     */
+    public function baseQuery($request)
+    {
+        /** @var \Illuminate\Database\Eloquent\Builder $query */
+        $query = Eventlog::hasAccess($request->user())
+            ->select($request->get('field'))->distinct();
+
+        if ($device_id = $request->get('device')) {
+            $query->where('device_id', $device_id);
+        }
+
+        return $query;
+    }
+}

app/Http/Controllers/Table/EventlogController.php

@@ -0,0 +1,119 @@
+<?php
+/**
+ * EventlogController.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2018 Tony Murray
+ * @author     Tony Murray <murraytony@gmail.com>
+ */
+
+namespace App\Http\Controllers\Table;
+
+use App\Models\Eventlog;
+use Carbon\Carbon;
+use LibreNMS\Config;
+use LibreNMS\Util\Url;
+
+class EventlogController extends TableController
+{
+    public function rules()
+    {
+        return [
+            'device' => 'nullable|int',
+            'eventtype' => 'nullable|string',
+        ];
+    }
+
+    /**
+     * Defines the base query for this resource
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder
+     */
+    public function baseQuery($request)
+    {
+        $query = Eventlog::hasAccess($request->user())->with('device');
+
+        if ($device_id = $request->get('device')) {
+            $query->where('device_id', $device_id);
+        }
+
+        if ($type = $request->get('eventtype')) {
+            $query->where('type', $type);
+        }
+
+        return $query;
+    }
+
+    public function formatItem($eventlog)
+    {
+        return [
+            'datetime' => $this->formatDatetime($eventlog),
+            'device_id' => Url::deviceLink($eventlog->device, $eventlog->device->shortDisplayName()),
+            'type' => $this->formatType($eventlog),
+            'message' => htmlspecialchars($eventlog->message),
+            'username' => $eventlog->username ?: 'System',
+        ];
+    }
+
+    private function formatType($eventlog)
+    {
+        if ($eventlog->type == 'interface') {
+            if (is_numeric($eventlog->reference)) {
+                $port = $eventlog->related;
+                return '<b>' . Url::portLink($port, $port->getShortLabel()) . '</b>';
+            }
+        }
+
+        return $eventlog->type;
+    }
+
+    private function formatDatetime($eventlog)
+    {
+        $output = "<span class='alert-status ";
+        $output .= $this->severityLabel($eventlog->severity);
+        $output .= " eventlog-status'></span><span style='display:inline;'>";
+        $output .= (new Carbon($eventlog->datetime))->format(Config::get('dateformat.compact'));
+        $output .= "</span>";
+
+        return $output;
+    }
+
+    /**
+     * @param int $eventlog_severity
+     * @return string $eventlog_severity_icon
+     */
+    private function severityLabel($eventlog_severity)
+    {
+        switch ($eventlog_severity) {
+            case 1:
+                return "label-success"; //OK
+            case 2:
+                return "label-info"; //Informational
+            case 3:
+                return "label-primary"; //Notice
+            case 4:
+                return "label-warning"; //Warning
+            case 5:
+                return "label-danger"; //Critical
+            default:
+                return "label-default"; //Unknown
+        }
+    } // end eventlog_severity
+}

app/Models/Device.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use DB;
 use Fico7489\Laravel\Pivot\Traits\PivotEventTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -175,6 +176,27 @@ class Device extends BaseModel
         return $name;
     }
 
+    /**
+     * Check if user can access this device.
+     *
+     * @param User $user
+     * @return bool
+     */
+    public function canAccess($user)
+    {
+        if (!$user) {
+            return false;
+        }
+
+        if ($user->hasGlobalRead()) {
+            return true;
+        }
+
+        return DB::table('devices_perms')
+            ->where('user_id', $user->user_id)
+            ->where('device_id', $this->device_id)->exists();
+    }
+
     public function formatUptime($short = false)
     {
         $result = '';

app/Models/Eventlog.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Eventlog.php
+ *
+ * -Description-
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2018 Tony Murray
+ * @author     Tony Murray <murraytony@gmail.com>
+ */
+
+namespace App\Models;
+
+class Eventlog extends BaseModel
+{
+    protected $table = 'eventlog';
+    protected $primaryKey = 'event_id';
+    public $timestamps = false;
+
+    // ---- Query scopes ----
+
+    public function scopeHasAccess($query, User $user)
+    {
+        return $this->hasDeviceAccess($query, $user);
+    }
+
+    // ---- Define Relationships ----
+
+    /**
+     * Returns the device this entry belongs to.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function device()
+    {
+        return $this->belongsTo('App\Models\Device', 'device_id');
+    }
+
+    public function related()
+    {
+        return $this->morphTo('related', 'type', 'reference');
+    }
+}

app/Models/Port.php

@@ -2,6 +2,10 @@
 
 namespace App\Models;
 
+use DB;
+use Illuminate\Database\Eloquent\Builder;
+use LibreNMS\Util\Rewrite;
+
 class Port extends BaseModel
 {
     public $timestamps = false;
@@ -16,15 +20,70 @@ class Port extends BaseModel
      */
     public function getLabel()
     {
-        if ($this->ifName) {
+        $os = $this->device->os;
-            return $this->ifName;
+
+        if (\LibreNMS\Config::getOsSetting($os, 'ifname')) {
+            $label = $this->ifName;
+        } elseif (\LibreNMS\Config::getOsSetting($os, 'ifalias')) {
+            $label = $this->ifAlias;
         }
 
-        if ($this->ifDescr) {
+        if (empty($label)) {
-            return $this->ifDescr;
+            $label = $this->ifDescr;
+
+            if (\LibreNMS\Config::getOsSetting($os, 'ifindex')) {
+                $label .= " $this->ifIndex";
+            }
         }
 
-        return $this->ifIndex;
+        foreach ((array)\LibreNMS\Config::get('rewrite_if', []) as $src => $val) {
+            if (str_i_contains($label, $src)) {
+                $label = $val;
+            }
+        }
+
+        foreach ((array)\LibreNMS\Config::get('rewrite_if_regexp', []) as $reg => $val) {
+            $label = preg_replace($reg.'i', $val, $label);
+        }
+
+        return $label;
+    }
+
+    /**
+     * Get the shortened label for this device.  Replaces things like GigabitEthernet with GE.
+     *
+     * @return string
+     */
+    public function getShortLabel()
+    {
+        return Rewrite::shortenIfName(Rewrite::normalizeIfName($this->getLabel()));
+    }
+
+    /**
+     * Check if user can access this port.
+     *
+     * @param User $user
+     * @return bool
+     */
+    public function canAccess($user)
+    {
+        if (!$user) {
+            return false;
+        }
+
+        if ($user->hasGlobalRead()) {
+            return true;
+        }
+
+        $port_query = DB::table('ports_perms')
+            ->where('user_id', $user->user_id)
+            ->where('port_id', $this->port_id);
+
+        $device_query = DB::table('devices_perms')
+            ->where('user_id', $user->user_id)
+            ->where('device_id', $this->device_id);
+
+        return $port_query->union($device_query)->exists();
     }
 
     // ---- Accessors/Mutators ----
@@ -39,6 +98,10 @@ class Port extends BaseModel
 
     // ---- Query scopes ----
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
     public function scopeIsDeleted($query)
     {
         return $query->where([
@@ -46,6 +109,10 @@ class Port extends BaseModel
         ]);
     }
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
     public function scopeIsNotDeleted($query)
     {
         return $query->where([
@@ -53,6 +120,10 @@ class Port extends BaseModel
         ]);
     }
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
     public function scopeIsUp($query)
     {
         return $query->where([
@@ -62,6 +133,10 @@ class Port extends BaseModel
         ]);
     }
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
     public function scopeIsDown($query)
     {
         return $query->where([
@@ -72,6 +147,10 @@ class Port extends BaseModel
         ]);
     }
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
     public function scopeIsIgnored($query)
     {
         return $query->where([
@@ -80,6 +159,10 @@ class Port extends BaseModel
         ]);
     }
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
     public function scopeIsDisabled($query)
     {
         return $query->where([
@@ -89,9 +172,14 @@ class Port extends BaseModel
         ]);
     }
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
     public function scopeHasErrors($query)
     {
         return $query->where(function ($query) {
+            /** @var Builder $query */
             $query->where('ifInErrors_delta', '>', 0)
                 ->orWhere('ifOutErrors_delta', '>', 0);
         });
@@ -109,6 +197,11 @@ class Port extends BaseModel
         return $this->belongsTo('App\Models\Device', 'device_id', 'device_id');
     }
 
+    public function events()
+    {
+        return $this->morphMany(Eventlog::class, 'events', 'type', 'reference');
+    }
+
     public function users()
     {
         // FIXME does not include global read

app/Models/Sensor.php

@@ -64,4 +64,9 @@ class Sensor extends BaseModel
     {
         return $this->belongsTo('App\Models\Device', 'device_id');
     }
+
+    public function events()
+    {
+        return $this->morphMany(Eventlog::class, 'events', 'type', 'reference');
+    }
 }

app/Providers/AppServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\ServiceProvider;
@@ -49,6 +50,8 @@ class AppServiceProvider extends ServiceProvider
             return "<?php endif; ?>";
         });
 
+        $this->configureMorphAliases();
+
         // Development service providers
         if ($this->app->environment() !== 'production') {
             if (class_exists(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class)) {
@@ -73,4 +76,12 @@ class AppServiceProvider extends ServiceProvider
     {
         //
     }
+
+    private function configureMorphAliases()
+    {
+        Relation::morphMap([
+            'interface' => \App\Models\Port::class,
+            'sensor' => \App\Models\Sensor::class,
+        ]);
+    }
 }

html/includes/common/eventlog.inc.php

@@ -20,7 +20,7 @@ $common_output[] = '
             <tr>
                 <th data-column-id="datetime" data-order="desc">Timestamp</th>
                 <th data-column-id="type">Type</th>
-                <th data-column-id="hostname">Hostname</th>
+                <th data-column-id="device_id">Hostname</th>
                 <th data-column-id="message">Message</th>
                 <th data-column-id="username">User</th>
             </tr>
@@ -35,12 +35,11 @@ var eventlog_grid = $("#eventlog").bootgrid({
     post: function ()
     {
         return {
-            id: "eventlog",
+            device: "' . (int)($vars['device']) . '",
-            device: "' . mres($vars['device']) . '",
+            eventtype: "' . addcslashes($vars['eventtype'], '"') . '",
-            eventtype: "' . mres($vars['eventtype']) . '",
         };
     },
-    url: "ajax_table.php"
+    url: "ajax/table/eventlog"
 });
 
 </script>

html/pages/eventlog.inc.php

@@ -13,14 +13,12 @@
  * @author     LibreNMS Contributors
 */
 
-use LibreNMS\Authentication\LegacyAuth;
+use App\Models\Device;
 
 $no_refresh = true;
-$param = array();
+$param = [];
-
+if ($device_id = (int)Request::get('device')) {
-if ($vars['action'] == 'expunge' && LegacyAuth::user()->hasGlobalAdmin()) {
+    $device = Device::find($device_id);
-    dbQuery('TRUNCATE TABLE `eventlog`');
-    print_message('Event log truncated');
 }
 
 $pagetitle[] = 'Eventlog';
@@ -41,50 +39,73 @@ $pagetitle[] = 'Eventlog';
     $('.actionBar').append(
         '<div class="pull-left">' +
         '<form method="post" action="" class="form-inline" role="form" id="result_form">' +
-        '<div class="form-group">' +
         <?php
         if (!isset($vars['fromdevice'])) {
         ?>
+        '<div class="form-group">' +
         '<label><strong>Device&nbsp;&nbsp;</strong></label>' +
-        '<select name="device" id="device" class="form-control input-sm">' +
+        '<select name="device" id="device" class="form-control">' +
         '<option value="">All Devices</option>' +
         <?php
-        foreach (get_all_devices() as $data) {
+        if ($device instanceof Device) {
-            if (device_permitted($data['device_id'])) {
+            echo "'<option value=$device->device_id>" . $device->displayName() . "</option>' +";
-                echo "'<option value=\"" . $data['device_id'] . "\"";
-                if ($data['device_id'] == $_POST['device']) {
-                    echo ' selected';
-                }
-
-                echo ">" . format_hostname($data) . "</option>' + ";
-            }
         }
         ?>
         '</select>' +
+        '</div>&nbsp;&nbsp;&nbsp;&nbsp;' +
         <?php
         } else {
-            echo "'&nbsp;&nbsp;<input type=\"hidden\" name=\"device\" id=\"device\" value=\"" . $vars['device'] . "\">' + ";
+            echo "'&nbsp;&nbsp;<input type=\"hidden\" name=\"device\" id=\"device\" value=\"" . $device_id . "\">' + ";
         }
         ?>
-        '</div>&nbsp;&nbsp;&nbsp;&nbsp;' +
         '<div class="form-group"><label><strong>Type&nbsp;&nbsp;</strong></label>' +
         '<select name="eventtype" id="eventtype" class="form-control input-sm">' +
         '<option value="">All types</option>' +
         <?php
-
+        if ($type = Request::get('eventtype')) {
-        foreach (dbFetchColumn("SELECT `type` FROM `eventlog` GROUP BY `type`") as $type) {
+            $js_type = addcslashes(htmlentities($type), "'");
-            echo "'<option value=\"" . $type . "\"";
+            echo "'<option value=\"$js_type\">$js_type</option>' +";
-            if ($type === $_POST['eventtype']) {
-                echo " selected";
-            }
-            echo ">" . $type . "</option>' + ";
         }
-
         ?>
         '</select>' +
         '</div>&nbsp;&nbsp;' +
-        '<button type="submit" class="btn btn-default input-sm">Filter</button>' +
+        '<button type="submit" class="btn btn-default">Filter</button>' +
         '</form>' +
         '</div>'
     );
+
+    <?php if (!isset($vars['fromdevice'])) { ?>
+    $("#device").select2({
+        theme: 'bootstrap',
+        dropdownAutoWidth : true,
+        width: "auto",
+        allowClear: true,
+        placeholder: "All Devices",
+        ajax: {
+            url: 'ajax/select/device',
+            delay: 200
+        }
+    })<?php echo $device_id ? ".val($device_id).trigger('change');" : ''; ?>;
+    <?php } ?>
+
+    $("#eventtype").select2({
+        theme: 'bootstrap',
+        dropdownAutoWidth : true,
+        width: "auto",
+        allowClear: true,
+        placeholder: "All Types",
+        ajax: {
+            url: 'ajax/select/eventlog',
+            delay: 200,
+            data: function(params) {
+                return {
+                    field: "type",
+                    device: $('#device').val(),
+                    term: params.term,
+                    page: params.page || 1
+                }
+            }
+        }
+    })<?php echo Request::get('eventtype') ? ".val('" . addcslashes(Request::get('eventtype'), "'") . "').trigger('change');" : ''; ?>;
+
 </script>

includes/rewrites.php

@@ -1,6 +1,8 @@
 <?php
 
 
+use LibreNMS\Util\Rewrite;
+
 function rewrite_location($location)
 {
     // FIXME -- also check the database for rewrites?
@@ -1004,59 +1006,13 @@ function rewrite_generic_hardware($hardware)
 
 function fixiftype($type)
 {
-    $rewrite_iftype = array(
+    return Rewrite::normalizeIfType($type);
-        '/^frameRelay$/'             => 'Frame Relay',
-        '/^ethernetCsmacd$/'         => 'Ethernet',
-        '/^softwareLoopback$/'       => 'Loopback',
-        '/^tunnel$/'                 => 'Tunnel',
-        '/^propVirtual$/'            => 'Virtual Int',
-        '/^ppp$/'                    => 'PPP',
-        '/^ds1$/'                    => 'DS1',
-        '/^pos$/'                    => 'POS',
-        '/^sonet$/'                  => 'SONET',
-        '/^slip$/'                   => 'SLIP',
-        '/^mpls$/'                   => 'MPLS Layer',
-        '/^l2vlan$/'                 => 'VLAN Subif',
-        '/^atm$/'                    => 'ATM',
-        '/^aal5$/'                   => 'ATM AAL5',
-        '/^atmSubInterface$/'        => 'ATM Subif',
-        '/^propPointToPointSerial$/' => 'PtP Serial',
-    );
-
-    $type = array_preg_replace($rewrite_iftype, $type);
-
-    return ($type);
 }
 
 
 function fixifName($inf)
 {
-    $rewrite_ifname = array(
+    return Rewrite::normalizeIfName($inf);
-        'ether'                                          => 'Ether',
-        'gig'                                            => 'Gig',
-        'fast'                                           => 'Fast',
-        'ten'                                            => 'Ten',
-        '-802.1q vlan subif'                             => '',
-        '-802.1q'                                        => '',
-        'bvi'                                            => 'BVI',
-        'vlan'                                           => 'Vlan',
-        'tunnel'                                         => 'Tunnel',
-        'serial'                                         => 'Serial',
-        '-aal5 layer'                                    => ' aal5',
-        'null'                                           => 'Null',
-        'atm'                                            => 'ATM',
-        'port-channel'                                   => 'Port-Channel',
-        'dial'                                           => 'Dial',
-        'hp procurve switch software loopback interface' => 'Loopback Interface',
-        'control plane interface'                        => 'Control Plane',
-        'loop'                                           => 'Loop',
-        'bundle-ether'                                   => 'Bundle-Ether',
-    );
-
-    $inf = strtolower($inf);
-    $inf = array_str_replace($rewrite_ifname, $inf);
-
-    return $inf;
 }
 
 

routes/web.php

@@ -33,11 +33,13 @@ Route::group(['middleware' => ['auth', '2fa'], 'guard' => 'auth'], function () {
         Route::post('set_resolution', 'ResolutionController@set');
 
         Route::group(['prefix' => 'select', 'namespace' => 'Select'], function () {
-            Route::get('syslog', 'SyslogController');
             Route::get('device', 'DeviceController');
+            Route::get('eventlog', 'EventlogController');
+            Route::get('syslog', 'SyslogController');
         });
 
         Route::group(['prefix' => 'table', 'namespace' => 'Table'], function () {
+            Route::post('eventlog', 'EventlogController');
             Route::post('syslog', 'SyslogController');
         });
     });