#48 Node Monitor supports matching on OUI

2018-03-10 09:26:00 +00:00
parent acd4ea79e0
commit dd44877059
10 changed files with 37 additions and 12 deletions
--- a/lib/App/Netdisco/DB/Result/Virtual/NodeMonitor.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/NodeMonitor.pm
@@ -16,7 +16,7 @@ SELECT nm.why, nm.cc, trim(trailing '.' from trim(trailing '0123456789' from dat
       d.name, d.location,
       dp.name AS portname
 FROM node_monitor nm, node n, device d, device_port dp
-WHERE nm.mac = n.mac
+WHERE ((nm.mac = n.mac) OR (nm.matchoui AND (substring(nm.mac::text from 1 for 8) = n.oui)))
  AND nm.active
  AND nm.cc IS NOT NULL
  AND d.ip = n.switch