Merge branch 'master' into og-api-tokens

share/config.yml

@@ -3,7 +3,9 @@
 #    DO NOT EDIT THIS FILE
 #
 # Overrides should go to ~/environments/deployment.yml
-# See App::Netdisco::Manual::Configuration for explanations
+#
+# https://github.com/netdisco/netdisco/wiki/Configuration has
+# in depth explanations about each setting.
 
 # ----------------
 # GENERAL SETTINGS
@@ -285,6 +287,7 @@ ignore_interfaces:
   - 'BRI\S+-Bearer Channel'
   - 'BRI\S+-Physical'
   - 'BRI\S+-Signalling'
+  - 'BRI\S+-Signaling'
   - 'Embedded-Service-Engine\d+\/\d+'
   - 'Virtual-Template\d+'
   - 'Virtual-Access\d+'
@@ -297,6 +300,10 @@ ignore_interfaces:
   - 'Ethernet(?:-| )QOS Packet Schedu?ler'
   - 'Ethernet(?:-| )WFP (?:802\.3|Native) MAC Layer Lightweight Filter'
   - 'ii\d\/\d\/\d+'
+ignore_notpresent_types:
+  - 'ethernetCsmacd'
+  - 'tunnel'
+  - 'ieee8023adLag'
 ignore_private_nets: false
 reverse_sysname: false
 phone_capabilities:
@@ -325,6 +332,7 @@ workers:
 
 # 50 minutes
 jobs_stale_after: 3000
+jobs_qdepth: 50
 
 dns:
   max_outstanding: 50

share/environments/deployment.yml

@@ -2,7 +2,9 @@
 # NETDISCO 2 CONFIGURATION FILE
 #
 # Settings in this file override share/config.yml
-# See App::Netdisco::Manual::Configuration for more info.
+#
+# https://github.com/netdisco/netdisco/wiki/Configuration has
+# in depth explanations about each setting.
 
 # ------------------
 # ESSENTIAL SETTINGS

share/views/ajax/device/netmap.tt

@@ -216,7 +216,7 @@ function saveMapPositions() {
   graph.inspect().main.nodes.each(function(n) { n.fixed = true });
   $.post(
     '[% uri_for('/ajax/data/device/netmappositions') %]'
-    ,$("#nd_vlan-entry, #nd_hgroup-select, #nd_lgroup-select, input[name='q'], input[name='mapshow']").serialize()
+    ,$("#nd_vlan-entry, #nd_hgroup-select, #nd_lgroup-select, #nq, input[name='mapshow']").serialize()
       + '&positions=' + JSON.stringify(graph.positions())
   );
   toastr.success('Saved map positions.');