delete hook (#1032)

* make log_message optional in delete_device

* add hooks support to delete job

* make delete job high prio

* web delete now queues job instead of inline delete

* move web logging into web package and remove userlog from device delete helper

* submit delete job for expire device instead of inline delete

* fixes to get web submit form for delete device to work

* enable delete hook functionality

share/config.yml

@@ -472,6 +472,7 @@ job_prio:
     - power
     - snapshot
     - vlan
+    - delete
   normal:
     - arpnip
     - arpwalk
@@ -493,6 +494,7 @@ worker_plugins:
   - 'Arpwalk'
   - 'Contact'
   - 'Delete'
+  - 'Delete::Hooks'
   - 'Discover'
   - 'Discover::CanonicalIP'
   - 'Discover::Entities'

share/views/ajax/admintask/duplicatedevices.tt

@@ -51,9 +51,9 @@
               </ul>
             </blockquote>
             <textarea id="nd_devdel-log" class="input-block-level" rows="2" data-form="delete"
-              placeholder="Enter a log message" name="log"></textarea>
+              placeholder="Enter a log message" name="extra"></textarea>
             <label class="checkbox" style="display: block">
-              <input id="nd_devdel-archive" type="checkbox" data-form="delete" name="archive">
+              <input id="nd_devdel-archive" type="checkbox" data-form="delete" name="port">
               <h4 class="nd_unbolden">Archive Nodes</h4>
             </label>
             <input type="hidden" data-form="delete" value="[% row.ip | html_entity %]" name="device"/>

share/views/ajax/device/details.tt

@@ -243,9 +243,9 @@
               </ul>
             </blockquote>
             <textarea id="nd_devdel-log" class="input-block-level" rows="2" data-form="delete"
-              placeholder="Enter a log message" name="log"></textarea>
+              placeholder="Enter a log message" name="extra"></textarea>
             <label class="checkbox">
-              <input id="nd_devdel-archive" type="checkbox" data-form="delete" name="archive">
+              <input id="nd_devdel-archive" type="checkbox" data-form="delete" name="port">
               <h4 class="nd_unbolden">Archive Nodes</h4>
             </label>
             <input type="hidden" data-form="delete" value="[% d.ip | html_entity %]" name="device"/>

share/views/js/device.js

@@ -176,7 +176,7 @@
             }
           }
           else {
-            toastr.success('Deleted device '+ tr.data('for-device'));
+            toastr.success('Queued job to delete '+ tr.data('for-device'));
           }
         }
         // skip any error reporting for now