#48 Node Monitor supports matching on OUI

share/config.yml

@@ -65,6 +65,7 @@ web_plugins:
   - Report::SubnetUtilization
   - Report::PortLog
   - AdminTask::JobQueue
+  - AdminTask::NodeMonitor
   - AdminTask::Topology
   - AdminTask::PollerPerformance
   - AdminTask::PseudoDevice
@@ -376,7 +377,7 @@ worker_plugins:
   - 'Macsuck::WirelessNodes'
   - 'Macwalk'
   - 'MakeRancidConf'
-  - 'Monitor'
+  - 'NodeMonitor'
   - 'Nbtstat'
   - 'Nbtstat::Core'
   - 'Nbtwalk'

share/schema_versions/App-Netdisco-DB-49-50-PostgreSQL.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE node_monitor ADD COLUMN "matchoui" boolean;
+
+COMMIT;

share/views/ajax/admintask/nodemonitor.tt

@@ -3,6 +3,7 @@
     <tr>
       <th class="nd_center-cell">Date Added</th>
       <th class="nd_center-cell">MAC Address</th>
+      <th class="nd_center-cell">Match OUI</th>
       <th class="nd_center-cell">Enabled</th>
       <th class="nd_center-cell">Reason</th>
       <th class="nd_center-cell">Email</th>
@@ -13,6 +14,7 @@
     <tr>
       <td class="nd_center-cell"></td>
       <td class="nd_center-cell"><input data-form="add" name="mac" type="text"></td>
+      <td class="nd_center-cell"><input data-form="add" name="matchoui" type="checkbox"></td>
       <td class="nd_center-cell"><input data-form="add" name="active" type="checkbox" checked></td>
       <td class="nd_center-cell"><input data-form="add" name="why" type="text"></td>
       <td class="nd_center-cell"><input data-form="add" name="cc"  type="email"></td>
@@ -29,6 +31,9 @@
       <td class="nd_center-cell">
         <input data-form="update" name="mac" type="text" value="[% row.mac | html_entity %]">
       </td>
+      <td class="nd_center-cell">
+        <input data-form="update" name="matchoui" type="checkbox" [% 'checked="checked"' IF row.matchoui %]>
+      </td>
       <td class="nd_center-cell">
         <input data-form="update" name="active" type="checkbox" [% 'checked="checked"' IF row.active %]>
       </td>
@@ -73,11 +78,11 @@ $(document).ready(function() {
   $('#data-table').dataTable({
     "columnDefs": [ 
       {
-        "targets": [ 0, 2, 5 ],
+        "targets": [ 0, 2, 3, 6 ],
         "searchable": false
       },
       {
-        "targets": [ 0, 2, 5 ],
+        "targets": [ 0, 2, 3, 6 ],
         "orderable": false
       }
     ],