Merge branch 'master' into og-api-tokens-simple

2019-03-11 17:55:31 +00:00
parent 5b1021b3b5 15c132a094
commit 3cf3a6b73a
65 changed files with 794 additions and 334 deletions
--- a/share/config.yml
+++ b/share/config.yml
@@ -88,6 +88,7 @@ web_plugins:
  - Device::Modules
  - Device::Neighbors
  - Device::Addresses
+  - Device::Vlans
 extra_web_plugins: []
 sidebar_defaults:
  search_node:
@@ -229,9 +230,9 @@ devices_no: []
 devices_only: []
 discover_no: []
 discover_only: []
-discover_no_type:
-  - '(?i)phone'
-  - '(?i)(?:wap|wireless)'
+discover_no_type: []
+discover_waps: true
+discover_phones: false
 discover_min_age: 0
 macsuck_no: []
 macsuck_only: []