diff --git a/LibreNMS/Util/Rewrite.php b/LibreNMS/Util/Rewrite.php
index 57623e59fa..1f6ff52d10 100644
--- a/LibreNMS/Util/Rewrite.php
+++ b/LibreNMS/Util/Rewrite.php
@@ -26,7 +26,7 @@
 namespace LibreNMS\Util;
 
 use App\Models\Device;
-use Cache;
+use Illuminate\Support\Facades\DB;
 use LibreNMS\Config;
 
 class Rewrite
@@ -148,20 +148,23 @@ class Rewrite
     }
 
     /**
-     * Extract the OUI and match it against cached values
+     * Extract the OUI and match it against database values
      *
      * @param  string  $mac
-     * @return string
+     * @return string|null
      */
     public static function readableOUI($mac)
     {
-        $cached = Cache::get('OUIDB-' . substr($mac, 0, 6), '');
-        if ($cached == 'IEEE Registration Authority') {
-            // Then we may have a shorter prefix, so let's try them one ater the other, ordered by probability
-            return Cache::get('OUIDB-' . substr($mac, 0, 9)) ?: Cache::get('OUIDB-' . substr($mac, 0, 7));
+        $oui = substr($mac, 0, 6);
+
+        $result = DB::table('vendor_ouis')->where('oui', $oui)->value('vendor');
+
+        if ($result === 'IEEE Registration Authority') {
+            // Then we may have a shorter prefix, so let's try them one after the other, ordered by probability
+            $result = DB::table('vendor_ouis')->whereIn('oui', [substr($mac, 0, 9), substr($mac, 0, 7)])->value('vendor');
         }
 
-        return $cached;
+        return $result ?: '';
     }
 
     /**
diff --git a/app/Http/Controllers/Table/FdbTablesController.php b/app/Http/Controllers/Table/FdbTablesController.php
old mode 100644
new mode 100755
index 1abda47b30..c7fdd74ad4
--- a/app/Http/Controllers/Table/FdbTablesController.php
+++ b/app/Http/Controllers/Table/FdbTablesController.php
@@ -31,6 +31,7 @@ use App\Models\PortsFdb;
 use App\Models\Vlan;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use LibreNMS\Util\IP;
 use LibreNMS\Util\Rewrite;
 use LibreNMS\Util\Url;
@@ -91,6 +92,10 @@ class FdbTablesController extends TableController
                     return $query->whereIn('ports_fdb.mac_address', $this->findMacs($search));
                 case 'description':
                     return $query->whereIntegerInRaw('ports_fdb.port_id', $this->findPorts($search));
+                case 'vendor':
+                    $vendor_ouis = $this->ouisFromVendor($search);
+
+                    return $this->findPortsByOui($vendor_ouis, $query);
                 default:
                     return $query->where(function ($query) use ($search, $mac_search) {
                         $query->where('ports_fdb.mac_address', 'like', $mac_search)
@@ -296,4 +301,39 @@ class FdbTablesController extends TableController
 
         return $this->macCountCache[$port->port_id];
     }
+
+    /**
+     * Get the OUI list for a specific vendor
+     *
+     * @param  string  $vendor
+     * @return array
+     */
+    protected function ouisFromVendor($vendor)
+    {
+        $matching_ouis = DB::table('vendor_ouis')
+            ->where('vendor', 'LIKE', '%' . $vendor . '%')
+            ->pluck('oui')
+            ->toArray();
+
+        return $matching_ouis;
+    }
+
+    /**
+     * Get all port ids from vendor OUIs
+     *
+     * @param  array  $vendor_ouis
+     * @return Builder
+     */
+    protected function findPortsByOui($vendor_ouis, $query)
+    {
+        $condition = '';
+        foreach ($vendor_ouis as $oui) {
+            $clean_oui = str_replace(':', '', $oui);
+            $condition .= " ports_fdb.mac_address LIKE '$clean_oui%' OR";
+        }
+        $condition = rtrim($condition, ' OR');
+        $query->whereRaw($condition);
+
+        return $query; // Return the query builder instance
+    }
 }
diff --git a/daily.php b/daily.php
index 56bd29c327..5b80606775 100644
--- a/daily.php
+++ b/daily.php
@@ -359,9 +359,9 @@ if ($options['f'] === 'peeringdb') {
 }
 
 if ($options['f'] === 'mac_oui') {
-    $lock = Cache::lock('macouidb', 86000);
+    $lock = Cache::lock('vendor_oui_db', 86000);
     if ($lock->get()) {
-        $res = cache_mac_oui();
+        $res = mac_oui_to_database();
         $lock->release();
         exit($res);
     }
diff --git a/daily.sh b/daily.sh
index 9db3f6bb11..4503e0a83e 100755
--- a/daily.sh
+++ b/daily.sh
@@ -341,7 +341,7 @@ main () {
                 # and clean up the db.
                 status_run 'Updating SQL-Schema' 'php includes/sql-schema/update.php'
                 status_run 'Cleaning up DB' "'$DAILY_SCRIPT' cleanup"
-                status_run 'Caching Mac OUI data' "$DAILY_SCRIPT mac_oui"
+                status_run 'Updating Mac OUI data' "$DAILY_SCRIPT mac_oui"
             ;;
             post-pull)
                 # re-check dependencies after pull with the new code
diff --git a/database/migrations/2023_06_02_230406_create_vendor_oui_table.php b/database/migrations/2023_06_02_230406_create_vendor_oui_table.php
new file mode 100644
index 0000000000..ea7b288ac3
--- /dev/null
+++ b/database/migrations/2023_06_02_230406_create_vendor_oui_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up(): void
+    {
+        Schema::create('vendor_ouis', function (Blueprint $table) {
+            $table->id();
+            $table->string('vendor');
+            $table->string('oui');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('vendor_ouis');
+    }
+};
diff --git a/includes/functions.php b/includes/functions.php
old mode 100644
new mode 100755
index 9d105a9a9f..7662c757f6
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1166,13 +1166,12 @@ function q_bridge_bits2indices($hex_data)
 /**
  * Function to generate Mac OUI Cache
  */
-function cache_mac_oui()
+function mac_oui_to_database()
 {
-    // timers:
+    // Refresh timer
     $mac_oui_refresh_int_min = 86400 * rand(7, 11); // 7 days + a random number between 0 and 4 days
-    $mac_oui_cache_time = 1296000; // we keep data during 15 days maximum
 
-    $lock = Cache::lock('macouidb-refresh', $mac_oui_refresh_int_min); //We want to refresh after at least $mac_oui_refresh_int_min
+    $lock = Cache::lock('vendor_oui_db_refresh', $mac_oui_refresh_int_min); // We want to refresh after at least $mac_oui_refresh_int_min
 
     if (Config::get('mac_oui.enabled') !== true) {
         echo 'Mac OUI integration disabled' . PHP_EOL;
@@ -1181,7 +1180,7 @@ function cache_mac_oui()
     }
 
     if ($lock->get()) {
-        echo 'Caching Mac OUI' . PHP_EOL;
+        echo 'Storing Mac OUI in the database' . PHP_EOL;
         try {
             $mac_oui_url = 'https://gitlab.com/wireshark/wireshark/-/raw/master/manuf';
             //$mac_oui_url_mirror = 'https://raw.githubusercontent.com/wireshark/wireshark/master/manuf';
@@ -1190,12 +1189,15 @@ function cache_mac_oui()
             $get = \LibreNMS\Util\Http::client()->get($mac_oui_url);
             echo '  -> Processing CSV ...' . PHP_EOL;
             $csv_data = $get->body();
+
+            // Process each line of the CSV data
             foreach (explode("\n", $csv_data) as $csv_line) {
                 unset($oui);
                 $entry = str_getcsv($csv_line, "\t");
 
                 $length = strlen($entry[0]);
                 $prefix = strtolower(str_replace(':', '', $entry[0]));
+                $vendor = $entry[2];
 
                 if (is_array($entry) && count($entry) >= 3 && $length == 8) {
                     // We have a standard OUI xx:xx:xx
@@ -1208,18 +1210,23 @@ function cache_mac_oui()
                         $oui = substr($prefix, 0, 9);
                     }
                 }
+
                 if (isset($oui)) {
-                    echo "Adding $oui, $entry[2]" . PHP_EOL;
-                    $key = 'OUIDB-' . $oui;
-                    Cache::put($key, $entry[2], $mac_oui_cache_time);
+                    // Store the OUI for the vendor in the database
+                    DB::table('vendor_ouis')->insert([
+                        'vendor' => $vendor,
+                        'oui' => $oui,
+                    ]);
+
+                    echo "Adding $oui for $vendor" . PHP_EOL;
                 }
             }
         } catch (Exception $e) {
-            echo 'Error processing Mac OUI :' . PHP_EOL;
+            echo 'Error processing Mac OUI:' . PHP_EOL;
             echo 'Exception: ' . get_class($e) . PHP_EOL;
             echo $e->getMessage() . PHP_EOL;
 
-            $lock->release(); // we did not succeed so we'll try again next time
+            $lock->release(); // We did not succeed, so we'll try again next time
 
             return 1;
         }
diff --git a/includes/html/pages/search/fdb.inc.php b/includes/html/pages/search/fdb.inc.php
old mode 100644
new mode 100755
index 6cbbef0eb1..d303dc52f4
--- a/includes/html/pages/search/fdb.inc.php
+++ b/includes/html/pages/search/fdb.inc.php
@@ -95,6 +95,14 @@ if ($vars['searchby'] == 'description') {
 ?>
 
                 ">Description</option>"+
+                "<option value=\"vendor\" "+
+<?php
+if ($vars['searchby'] == 'vendor') {
+    echo '" selected "+';
+}
+?>
+
+                ">Vendor</option>"+
                 "<option value=\"vlan\" "+
 <?php
 if ($vars['searchby'] == 'vlan') {
diff --git a/misc/db_schema.yaml b/misc/db_schema.yaml
index d0c7752c16..aa6d6adb00 100644
--- a/misc/db_schema.yaml
+++ b/misc/db_schema.yaml
@@ -78,7 +78,7 @@ alert_rules:
   Columns:
     - { Field: id, Type: 'int unsigned', 'Null': false, Extra: auto_increment }
     - { Field: rule, Type: text, 'Null': false, Extra: '' }
-    - { Field: severity, Type: 'enum(''ok'',''warning'',''critical'')', 'Null': false, Extra: '' }
+    - { Field: severity, Type: "enum('ok','warning','critical')", 'Null': false, Extra: '' }
     - { Field: extra, Type: varchar(255), 'Null': false, Extra: '' }
     - { Field: disabled, Type: tinyint, 'Null': false, Extra: '' }
     - { Field: name, Type: varchar(255), 'Null': false, Extra: '' }
@@ -501,7 +501,7 @@ devices:
     - { Field: ip, Type: varbinary(16), 'Null': true, Extra: '' }
     - { Field: overwrite_ip, Type: varchar(40), 'Null': true, Extra: '' }
     - { Field: community, Type: varchar(255), 'Null': true, Extra: '' }
-    - { Field: authlevel, Type: 'enum(''noAuthNoPriv'',''authNoPriv'',''authPriv'')', 'Null': true, Extra: '' }
+    - { Field: authlevel, Type: "enum('noAuthNoPriv','authNoPriv','authPriv')", 'Null': true, Extra: '' }
     - { Field: authname, Type: varchar(64), 'Null': true, Extra: '' }
     - { Field: authpass, Type: varchar(64), 'Null': true, Extra: '' }
     - { Field: authalgo, Type: varchar(10), 'Null': true, Extra: '' }
@@ -968,15 +968,15 @@ mpls_lsps:
     - { Field: vrf_oid, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: lsp_oid, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' }
-    - { Field: mplsLspRowStatus, Type: 'enum(''active'',''notInService'',''notReady'',''createAndGo'',''createAndWait'',''destroy'')', 'Null': false, Extra: '' }
+    - { Field: mplsLspRowStatus, Type: "enum('active','notInService','notReady','createAndGo','createAndWait','destroy')", 'Null': false, Extra: '' }
     - { Field: mplsLspLastChange, Type: bigint, 'Null': true, Extra: '' }
     - { Field: mplsLspName, Type: varchar(64), 'Null': false, Extra: '' }
-    - { Field: mplsLspAdminState, Type: 'enum(''noop'',''inService'',''outOfService'')', 'Null': false, Extra: '' }
-    - { Field: mplsLspOperState, Type: 'enum(''unknown'',''inService'',''outOfService'',''transition'')', 'Null': false, Extra: '' }
+    - { Field: mplsLspAdminState, Type: "enum('noop','inService','outOfService')", 'Null': false, Extra: '' }
+    - { Field: mplsLspOperState, Type: "enum('unknown','inService','outOfService','transition')", 'Null': false, Extra: '' }
     - { Field: mplsLspFromAddr, Type: varchar(32), 'Null': false, Extra: '' }
     - { Field: mplsLspToAddr, Type: varchar(32), 'Null': false, Extra: '' }
-    - { Field: mplsLspType, Type: 'enum(''unknown'',''dynamic'',''static'',''bypassOnly'',''p2mpLsp'',''p2mpAuto'',''mplsTp'',''meshP2p'',''oneHopP2p'',''srTe'',''meshP2pSrTe'',''oneHopP2pSrTe'')', 'Null': false, Extra: '' }
-    - { Field: mplsLspFastReroute, Type: 'enum(''true'',''false'')', 'Null': false, Extra: '' }
+    - { Field: mplsLspType, Type: "enum('unknown','dynamic','static','bypassOnly','p2mpLsp','p2mpAuto','mplsTp','meshP2p','oneHopP2p','srTe','meshP2pSrTe','oneHopP2pSrTe')", 'Null': false, Extra: '' }
+    - { Field: mplsLspFastReroute, Type: "enum('true','false')", 'Null': false, Extra: '' }
     - { Field: mplsLspAge, Type: bigint, 'Null': true, Extra: '' }
     - { Field: mplsLspTimeUp, Type: bigint, 'Null': true, Extra: '' }
     - { Field: mplsLspTimeDown, Type: bigint, 'Null': true, Extra: '' }
@@ -995,14 +995,14 @@ mpls_lsp_paths:
     - { Field: lsp_id, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: path_oid, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' }
-    - { Field: mplsLspPathRowStatus, Type: 'enum(''active'',''notInService'',''notReady'',''createAndGo'',''createAndWait'',''destroy'')', 'Null': false, Extra: '' }
+    - { Field: mplsLspPathRowStatus, Type: "enum('active','notInService','notReady','createAndGo','createAndWait','destroy')", 'Null': false, Extra: '' }
     - { Field: mplsLspPathLastChange, Type: bigint, 'Null': false, Extra: '' }
-    - { Field: mplsLspPathType, Type: 'enum(''other'',''primary'',''standby'',''secondary'')', 'Null': false, Extra: '' }
+    - { Field: mplsLspPathType, Type: "enum('other','primary','standby','secondary')", 'Null': false, Extra: '' }
     - { Field: mplsLspPathBandwidth, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: mplsLspPathOperBandwidth, Type: 'int unsigned', 'Null': false, Extra: '' }
-    - { Field: mplsLspPathAdminState, Type: 'enum(''noop'',''inService'',''outOfService'')', 'Null': false, Extra: '' }
-    - { Field: mplsLspPathOperState, Type: 'enum(''unknown'',''inService'',''outOfService'',''transition'')', 'Null': false, Extra: '' }
-    - { Field: mplsLspPathState, Type: 'enum(''unknown'',''active'',''inactive'')', 'Null': false, Extra: '' }
+    - { Field: mplsLspPathAdminState, Type: "enum('noop','inService','outOfService')", 'Null': false, Extra: '' }
+    - { Field: mplsLspPathOperState, Type: "enum('unknown','inService','outOfService','transition')", 'Null': false, Extra: '' }
+    - { Field: mplsLspPathState, Type: "enum('unknown','active','inactive')", 'Null': false, Extra: '' }
     - { Field: mplsLspPathFailCode, Type: varchar(64), 'Null': false, Extra: '' }
     - { Field: mplsLspPathFailNodeAddr, Type: varchar(32), 'Null': false, Extra: '' }
     - { Field: mplsLspPathMetric, Type: 'int unsigned', 'Null': false, Extra: '' }
@@ -1024,11 +1024,11 @@ mpls_saps:
     - { Field: ifName, Type: varchar(255), 'Null': true, Extra: '' }
     - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: sapEncapValue, Type: varchar(255), 'Null': true, Extra: '' }
-    - { Field: sapRowStatus, Type: 'enum(''active'',''notInService'',''notReady'',''createAndGo'',''createAndWait'',''destroy'')', 'Null': true, Extra: '' }
-    - { Field: sapType, Type: 'enum(''unknown'',''epipe'',''tls'',''vprn'',''ies'',''mirror'',''apipe'',''fpipe'',''ipipe'',''cpipe'',''intTls'',''evpnIsaTls'')', 'Null': true, Extra: '' }
+    - { Field: sapRowStatus, Type: "enum('active','notInService','notReady','createAndGo','createAndWait','destroy')", 'Null': true, Extra: '' }
+    - { Field: sapType, Type: "enum('unknown','epipe','tls','vprn','ies','mirror','apipe','fpipe','ipipe','cpipe','intTls','evpnIsaTls')", 'Null': true, Extra: '' }
     - { Field: sapDescription, Type: varchar(80), 'Null': true, Extra: '' }
-    - { Field: sapAdminStatus, Type: 'enum(''up'',''down'')', 'Null': true, Extra: '' }
-    - { Field: sapOperStatus, Type: 'enum(''up'',''down'')', 'Null': true, Extra: '' }
+    - { Field: sapAdminStatus, Type: "enum('up','down')", 'Null': true, Extra: '' }
+    - { Field: sapOperStatus, Type: "enum('up','down')", 'Null': true, Extra: '' }
     - { Field: sapLastMgmtChange, Type: bigint, 'Null': true, Extra: '' }
     - { Field: sapLastStatusChange, Type: bigint, 'Null': true, Extra: '' }
   Indexes:
@@ -1039,17 +1039,17 @@ mpls_sdps:
     - { Field: sdp_id, Type: 'int unsigned', 'Null': false, Extra: auto_increment }
     - { Field: sdp_oid, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' }
-    - { Field: sdpRowStatus, Type: 'enum(''active'',''notInService'',''notReady'',''createAndGo'',''createAndWait'',''destroy'')', 'Null': true, Extra: '' }
-    - { Field: sdpDelivery, Type: 'enum(''gre'',''mpls'',''l2tpv3'',''greethbridged'')', 'Null': true, Extra: '' }
+    - { Field: sdpRowStatus, Type: "enum('active','notInService','notReady','createAndGo','createAndWait','destroy')", 'Null': true, Extra: '' }
+    - { Field: sdpDelivery, Type: "enum('gre','mpls','l2tpv3','greethbridged')", 'Null': true, Extra: '' }
     - { Field: sdpDescription, Type: varchar(80), 'Null': true, Extra: '' }
-    - { Field: sdpAdminStatus, Type: 'enum(''up'',''down'')', 'Null': true, Extra: '' }
-    - { Field: sdpOperStatus, Type: 'enum(''up'',''notAlive'',''notReady'',''invalidEgressInterface'',''transportTunnelDown'',''down'')', 'Null': true, Extra: '' }
+    - { Field: sdpAdminStatus, Type: "enum('up','down')", 'Null': true, Extra: '' }
+    - { Field: sdpOperStatus, Type: "enum('up','notAlive','notReady','invalidEgressInterface','transportTunnelDown','down')", 'Null': true, Extra: '' }
     - { Field: sdpAdminPathMtu, Type: int, 'Null': true, Extra: '' }
     - { Field: sdpOperPathMtu, Type: int, 'Null': true, Extra: '' }
     - { Field: sdpLastMgmtChange, Type: bigint, 'Null': true, Extra: '' }
     - { Field: sdpLastStatusChange, Type: bigint, 'Null': true, Extra: '' }
-    - { Field: sdpActiveLspType, Type: 'enum(''not-applicable'',''rsvp'',''ldp'',''bgp'',''none'',''mplsTp'',''srIsis'',''srOspf'',''srTeLsp'',''fpe'')', 'Null': true, Extra: '' }
-    - { Field: sdpFarEndInetAddressType, Type: 'enum(''ipv4'',''ipv6'')', 'Null': true, Extra: '' }
+    - { Field: sdpActiveLspType, Type: "enum('not-applicable','rsvp','ldp','bgp','none','mplsTp','srIsis','srOspf','srTeLsp','fpe')", 'Null': true, Extra: '' }
+    - { Field: sdpFarEndInetAddressType, Type: "enum('ipv4','ipv6')", 'Null': true, Extra: '' }
     - { Field: sdpFarEndInetAddress, Type: varchar(46), 'Null': true, Extra: '' }
   Indexes:
     PRIMARY: { Name: PRIMARY, Columns: [sdp_id], Unique: true, Type: BTREE }
@@ -1062,13 +1062,13 @@ mpls_sdp_binds:
     - { Field: sdp_oid, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: svc_oid, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' }
-    - { Field: sdpBindRowStatus, Type: 'enum(''active'',''notInService'',''notReady'',''createAndGo'',''createAndWait'',''destroy'')', 'Null': true, Extra: '' }
-    - { Field: sdpBindAdminStatus, Type: 'enum(''up'',''down'')', 'Null': true, Extra: '' }
-    - { Field: sdpBindOperStatus, Type: 'enum(''up'',''down'')', 'Null': true, Extra: '' }
+    - { Field: sdpBindRowStatus, Type: "enum('active','notInService','notReady','createAndGo','createAndWait','destroy')", 'Null': true, Extra: '' }
+    - { Field: sdpBindAdminStatus, Type: "enum('up','down')", 'Null': true, Extra: '' }
+    - { Field: sdpBindOperStatus, Type: "enum('up','down')", 'Null': true, Extra: '' }
     - { Field: sdpBindLastMgmtChange, Type: bigint, 'Null': true, Extra: '' }
     - { Field: sdpBindLastStatusChange, Type: bigint, 'Null': true, Extra: '' }
-    - { Field: sdpBindType, Type: 'enum(''spoke'',''mesh'')', 'Null': true, Extra: '' }
-    - { Field: sdpBindVcType, Type: 'enum(''undef'',''ether'',''vlan'',''mirrior'',''atmSduatmCell'',''atmVcc'',''atmVpc'',''frDlci'',''ipipe'',''satopE1'',''satopT1'',''satopE3'',''satopT3'',''cesopsn'',''cesopsnCas'')', 'Null': true, Extra: '' }
+    - { Field: sdpBindType, Type: "enum('spoke','mesh')", 'Null': true, Extra: '' }
+    - { Field: sdpBindVcType, Type: "enum('undef','ether','vlan','mirrior','atmSduatmCell','atmVcc','atmVpc','frDlci','ipipe','satopE1','satopT1','satopE3','satopT3','cesopsn','cesopsnCas')", 'Null': true, Extra: '' }
     - { Field: sdpBindBaseStatsIngFwdPackets, Type: bigint, 'Null': true, Extra: '' }
     - { Field: sdpBindBaseStatsIngFwdOctets, Type: bigint, 'Null': true, Extra: '' }
     - { Field: sdpBindBaseStatsEgrFwdPackets, Type: bigint, 'Null': true, Extra: '' }
@@ -1081,11 +1081,11 @@ mpls_services:
     - { Field: svc_id, Type: 'int unsigned', 'Null': false, Extra: auto_increment }
     - { Field: svc_oid, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' }
-    - { Field: svcRowStatus, Type: 'enum(''active'',''notInService'',''notReady'',''createAndGo'',''createAndWait'',''destroy'')', 'Null': true, Extra: '' }
-    - { Field: svcType, Type: 'enum(''unknown'',''epipe'',''tls'',''vprn'',''ies'',''mirror'',''apipe'',''fpipe'',''ipipe'',''cpipe'',''intTls'',''evpnIsaTls'')', 'Null': true, Extra: '' }
+    - { Field: svcRowStatus, Type: "enum('active','notInService','notReady','createAndGo','createAndWait','destroy')", 'Null': true, Extra: '' }
+    - { Field: svcType, Type: "enum('unknown','epipe','tls','vprn','ies','mirror','apipe','fpipe','ipipe','cpipe','intTls','evpnIsaTls')", 'Null': true, Extra: '' }
     - { Field: svcCustId, Type: 'int unsigned', 'Null': true, Extra: '' }
-    - { Field: svcAdminStatus, Type: 'enum(''up'',''down'')', 'Null': true, Extra: '' }
-    - { Field: svcOperStatus, Type: 'enum(''up'',''down'')', 'Null': true, Extra: '' }
+    - { Field: svcAdminStatus, Type: "enum('up','down')", 'Null': true, Extra: '' }
+    - { Field: svcOperStatus, Type: "enum('up','down')", 'Null': true, Extra: '' }
     - { Field: svcDescription, Type: varchar(80), 'Null': true, Extra: '' }
     - { Field: svcMtu, Type: int, 'Null': true, Extra: '' }
     - { Field: svcNumSaps, Type: int, 'Null': true, Extra: '' }
@@ -1093,9 +1093,9 @@ mpls_services:
     - { Field: svcLastMgmtChange, Type: bigint, 'Null': true, Extra: '' }
     - { Field: svcLastStatusChange, Type: bigint, 'Null': true, Extra: '' }
     - { Field: svcVRouterId, Type: int, 'Null': true, Extra: '' }
-    - { Field: svcTlsMacLearning, Type: 'enum(''enabled'',''disabled'')', 'Null': true, Extra: '' }
-    - { Field: svcTlsStpAdminStatus, Type: 'enum(''enabled'',''disabled'')', 'Null': true, Extra: '' }
-    - { Field: svcTlsStpOperStatus, Type: 'enum(''up'',''down'')', 'Null': true, Extra: '' }
+    - { Field: svcTlsMacLearning, Type: "enum('enabled','disabled')", 'Null': true, Extra: '' }
+    - { Field: svcTlsStpAdminStatus, Type: "enum('enabled','disabled')", 'Null': true, Extra: '' }
+    - { Field: svcTlsStpOperStatus, Type: "enum('up','down')", 'Null': true, Extra: '' }
     - { Field: svcTlsFdbTableSize, Type: int, 'Null': true, Extra: '' }
     - { Field: svcTlsFdbNumEntries, Type: int, 'Null': true, Extra: '' }
   Indexes:
@@ -1108,16 +1108,16 @@ mpls_tunnel_ar_hops:
     - { Field: mplsTunnelARHopIndex, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: lsp_path_id, Type: 'int unsigned', 'Null': false, Extra: '' }
-    - { Field: mplsTunnelARHopAddrType, Type: 'enum(''unknown'',''ipV4'',''ipV6'',''asNumber'',''lspid'',''unnum'')', 'Null': true, Extra: '' }
+    - { Field: mplsTunnelARHopAddrType, Type: "enum('unknown','ipV4','ipV6','asNumber','lspid','unnum')", 'Null': true, Extra: '' }
     - { Field: mplsTunnelARHopIpv4Addr, Type: varchar(15), 'Null': true, Extra: '' }
     - { Field: mplsTunnelARHopIpv6Addr, Type: varchar(45), 'Null': true, Extra: '' }
     - { Field: mplsTunnelARHopAsNumber, Type: 'int unsigned', 'Null': true, Extra: '' }
-    - { Field: mplsTunnelARHopStrictOrLoose, Type: 'enum(''strict'',''loose'')', 'Null': true, Extra: '' }
+    - { Field: mplsTunnelARHopStrictOrLoose, Type: "enum('strict','loose')", 'Null': true, Extra: '' }
     - { Field: mplsTunnelARHopRouterId, Type: varchar(15), 'Null': true, Extra: '' }
-    - { Field: localProtected, Type: 'enum(''false'',''true'')', 'Null': false, Extra: '', Default: 'false' }
-    - { Field: linkProtectionInUse, Type: 'enum(''false'',''true'')', 'Null': false, Extra: '', Default: 'false' }
-    - { Field: bandwidthProtected, Type: 'enum(''false'',''true'')', 'Null': false, Extra: '', Default: 'false' }
-    - { Field: nextNodeProtected, Type: 'enum(''false'',''true'')', 'Null': false, Extra: '', Default: 'false' }
+    - { Field: localProtected, Type: "enum('false','true')", 'Null': false, Extra: '', Default: 'false' }
+    - { Field: linkProtectionInUse, Type: "enum('false','true')", 'Null': false, Extra: '', Default: 'false' }
+    - { Field: bandwidthProtected, Type: "enum('false','true')", 'Null': false, Extra: '', Default: 'false' }
+    - { Field: nextNodeProtected, Type: "enum('false','true')", 'Null': false, Extra: '', Default: 'false' }
   Indexes:
     PRIMARY: { Name: PRIMARY, Columns: [ar_hop_id], Unique: true, Type: BTREE }
     mpls_tunnel_ar_hops_device_id_index: { Name: mpls_tunnel_ar_hops_device_id_index, Columns: [device_id], Unique: false, Type: BTREE }
@@ -1128,11 +1128,11 @@ mpls_tunnel_c_hops:
     - { Field: mplsTunnelCHopIndex, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: device_id, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: lsp_path_id, Type: 'int unsigned', 'Null': true, Extra: '' }
-    - { Field: mplsTunnelCHopAddrType, Type: 'enum(''unknown'',''ipV4'',''ipV6'',''asNumber'',''lspid'',''unnum'')', 'Null': true, Extra: '' }
+    - { Field: mplsTunnelCHopAddrType, Type: "enum('unknown','ipV4','ipV6','asNumber','lspid','unnum')", 'Null': true, Extra: '' }
     - { Field: mplsTunnelCHopIpv4Addr, Type: varchar(15), 'Null': true, Extra: '' }
     - { Field: mplsTunnelCHopIpv6Addr, Type: varchar(45), 'Null': true, Extra: '' }
     - { Field: mplsTunnelCHopAsNumber, Type: 'int unsigned', 'Null': true, Extra: '' }
-    - { Field: mplsTunnelCHopStrictOrLoose, Type: 'enum(''strict'',''loose'')', 'Null': true, Extra: '' }
+    - { Field: mplsTunnelCHopStrictOrLoose, Type: "enum('strict','loose')", 'Null': true, Extra: '' }
     - { Field: mplsTunnelCHopRouterId, Type: varchar(15), 'Null': true, Extra: '' }
   Indexes:
     PRIMARY: { Name: PRIMARY, Columns: [c_hop_id], Unique: true, Type: BTREE }
@@ -1158,11 +1158,11 @@ munin_plugins_ds:
   Columns:
     - { Field: mplug_id, Type: 'int unsigned', 'Null': false, Extra: '' }
     - { Field: ds_name, Type: varchar(32), 'Null': false, Extra: '' }
-    - { Field: ds_type, Type: 'enum(''COUNTER'',''ABSOLUTE'',''DERIVE'',''GAUGE'')', 'Null': false, Extra: '', Default: GAUGE }
+    - { Field: ds_type, Type: "enum('COUNTER','ABSOLUTE','DERIVE','GAUGE')", 'Null': false, Extra: '', Default: GAUGE }
     - { Field: ds_label, Type: varchar(64), 'Null': false, Extra: '' }
     - { Field: ds_cdef, Type: varchar(255), 'Null': false, Extra: '' }
     - { Field: ds_draw, Type: varchar(64), 'Null': false, Extra: '' }
-    - { Field: ds_graph, Type: 'enum(''no'',''yes'')', 'Null': false, Extra: '', Default: 'yes' }
+    - { Field: ds_graph, Type: "enum('no','yes')", 'Null': false, Extra: '', Default: 'yes' }
     - { Field: ds_info, Type: varchar(255), 'Null': false, Extra: '' }
     - { Field: ds_extinfo, Type: text, 'Null': false, Extra: '' }
     - { Field: ds_max, Type: varchar(32), 'Null': false, Extra: '' }
@@ -1813,13 +1813,13 @@ sensors:
     - { Field: sensor_limit_low, Type: double, 'Null': true, Extra: '' }
     - { Field: sensor_limit_low_warn, Type: double, 'Null': true, Extra: '' }
     - { Field: sensor_alert, Type: tinyint, 'Null': false, Extra: '', Default: '1' }
-    - { Field: sensor_custom, Type: 'enum(''No'',''Yes'')', 'Null': false, Extra: '', Default: 'No' }
+    - { Field: sensor_custom, Type: "enum('No','Yes')", 'Null': false, Extra: '', Default: 'No' }
     - { Field: entPhysicalIndex, Type: varchar(16), 'Null': true, Extra: '' }
     - { Field: entPhysicalIndex_measured, Type: varchar(16), 'Null': true, Extra: '' }
     - { Field: lastupdate, Type: timestamp, 'Null': false, Extra: 'on update CURRENT_TIMESTAMP', Default: CURRENT_TIMESTAMP }
     - { Field: sensor_prev, Type: double, 'Null': true, Extra: '' }
     - { Field: user_func, Type: varchar(100), 'Null': true, Extra: '' }
-    - { Field: rrd_type, Type: 'enum(''GAUGE'',''COUNTER'',''DERIVE'',''DCOUNTER'',''DDERIVE'',''ABSOLUTE'')', 'Null': false, Extra: '', Default: GAUGE }
+    - { Field: rrd_type, Type: "enum('GAUGE','COUNTER','DERIVE','DCOUNTER','DDERIVE','ABSOLUTE')", 'Null': false, Extra: '', Default: GAUGE }
   Indexes:
     PRIMARY: { Name: PRIMARY, Columns: [sensor_id], Unique: true, Type: BTREE }
     sensors_device_id_index: { Name: sensors_device_id_index, Columns: [device_id], Unique: false, Type: BTREE }
@@ -1928,7 +1928,7 @@ slas:
     - { Field: rtt_type, Type: varchar(16), 'Null': false, Extra: '' }
     - { Field: rtt, Type: 'double(8,2) unsigned', 'Null': true, Extra: '' }
     - { Field: status, Type: tinyint, 'Null': false, Extra: '' }
-    - { Field: opstatus, Type: tinyint unsigned, 'Null': false, Extra: '', Default: '0' }
+    - { Field: opstatus, Type: 'tinyint unsigned', 'Null': false, Extra: '', Default: '0' }
     - { Field: deleted, Type: tinyint, 'Null': false, Extra: '', Default: '0' }
   Indexes:
     PRIMARY: { Name: PRIMARY, Columns: [sla_id], Unique: true, Type: BTREE }
@@ -2089,6 +2089,13 @@ users_widgets:
   Indexes:
     PRIMARY: { Name: PRIMARY, Columns: [user_widget_id], Unique: true, Type: BTREE }
     user_id: { Name: user_id, Columns: [user_id], Unique: false, Type: BTREE }
+vendor_ouis:
+  Columns:
+    - { Field: id, Type: 'bigint unsigned', 'Null': false, Extra: auto_increment }
+    - { Field: vendor, Type: varchar(255), 'Null': false, Extra: '' }
+    - { Field: oui, Type: varchar(255), 'Null': false, Extra: '' }
+  Indexes:
+    PRIMARY: { Name: PRIMARY, Columns: [id], Unique: true, Type: BTREE }
 vlans:
   Columns:
     - { Field: vlan_id, Type: 'int unsigned', 'Null': false, Extra: auto_increment }
@@ -2160,13 +2167,13 @@ wireless_sensors:
     - { Field: sensor_limit_low, Type: double, 'Null': true, Extra: '' }
     - { Field: sensor_limit_low_warn, Type: double, 'Null': true, Extra: '' }
     - { Field: sensor_alert, Type: tinyint, 'Null': false, Extra: '', Default: '1' }
-    - { Field: sensor_custom, Type: 'enum(''No'',''Yes'')', 'Null': false, Extra: '', Default: 'No' }
+    - { Field: sensor_custom, Type: "enum('No','Yes')", 'Null': false, Extra: '', Default: 'No' }
     - { Field: entPhysicalIndex, Type: varchar(16), 'Null': true, Extra: '' }
     - { Field: entPhysicalIndex_measured, Type: varchar(16), 'Null': true, Extra: '' }
     - { Field: lastupdate, Type: timestamp, 'Null': false, Extra: '', Default: CURRENT_TIMESTAMP }
     - { Field: sensor_oids, Type: text, 'Null': false, Extra: '' }
     - { Field: access_point_id, Type: 'int unsigned', 'Null': true, Extra: '' }
-    - { Field: rrd_type, Type: 'enum(''GAUGE'',''COUNTER'',''DERIVE'',''DCOUNTER'',''DDERIVE'',''ABSOLUTE'')', 'Null': false, Extra: '', Default: GAUGE }
+    - { Field: rrd_type, Type: "enum('GAUGE','COUNTER','DERIVE','DCOUNTER','DDERIVE','ABSOLUTE')", 'Null': false, Extra: '', Default: GAUGE }
   Indexes:
     PRIMARY: { Name: PRIMARY, Columns: [sensor_id], Unique: true, Type: BTREE }
     wireless_sensors_device_id_index: { Name: wireless_sensors_device_id_index, Columns: [device_id], Unique: false, Type: BTREE }