#925 implement ignore_deviceports and hide_deviceports

share/config.yml

@@ -147,6 +147,7 @@ sidebar_defaults:
     age_unit:      { default: months }
     p_vlan_names:  { label: 'Use VLAN Names', default: null, idx: 0 }
     p_hide1002:    { label: 'Hide VLAN 1002-1005', default: null, idx: 1 }
+    p_include_hidden: { label: 'Include Hidden Ports', default: null, idx: 2 }
   device_netmap:
     showips:     { default: null }
     showspeed:   { default: null }
@@ -209,6 +210,7 @@ check_userlog: false
 devport_vlan_limit: 150
 login_logo: ""
 defanged_admin: 'admin'
+hide_deviceports: []
 
 # -------------
 # NETDISCO CORE
@@ -220,9 +222,51 @@ host_groups:
   __ANY__:
     - '0.0.0.0/0'
     - '::/0'
-  __LOCAL_ADDRESSES__:
+  __LOOPBACK_ADDRESSES__:
     - '::1'
     - '127.0.0.0/8'
+  __LOCAL_ADDRESSES__:
+    - '169.254.0.0/16'
+    - 'fe80::/10'
+  __LOOPBACK_WITH_NO_IP__:
+    - 'op:and'
+    - 'alias:'
+    - 'type:softwareLoopback'
+  __IGNORE_INTERFACES__:
+    - 'port:EOBC'
+    - 'port:unrouted VLAN(?: \d+)?'
+    - 'port:StackPort'
+    - 'port:Control Plane Interface'
+    - 'port:SPAN (S|R)P Interface'
+    - 'port:StackSub-.*'
+    - 'port:StackPort\d+'
+    - 'port:netflow'
+    - 'port:Vlan\d+-mpls layer'
+    - 'port:BRI\S+-Bearer Channel'
+    - 'port:BRI\S+-Physical'
+    - 'port:BRI\S+-Signalling'
+    - 'port:BRI\S+-Signaling'
+    - 'port:Embedded-Service-Engine\d+\/\d+'
+    - 'port:Virtual-Template\d+'
+    - 'port:Virtual-Access\d+'
+    - 'port:(E|T)\d \d\/\d\/\d'
+    - 'port:InLoopback0'
+    - 'port:NULL\d'
+    - 'port:Register-Tunnel\d'
+    - 'port:Blade-Aggregation\d'
+    - 'port:M-GigabitEthernet\d\/\d\/\d'
+    - 'port:Ethernet(?:-| )QOS Packet Scheduler'
+    - 'port:Ethernet(?:-| )WFP (?:802\.3|Native) MAC Layer Lightweight Filter'
+    - 'port:ii\d\/\d\/\d+'
+  __IGNORE_INTERFACE_TYPES__: []
+  __NOTPRESENT_TYPES__:
+    - 'type:ethernetCsmacd'
+    - 'type:tunnel'
+    - 'type:ieee8023adLag'
+  __IGNORE_NOTPRESENT_TYPES__:
+    - 'op:and'
+    - 'up:notPresent'
+    - 'group:__NOTPRESENT_TYPES__'
 host_group_displaynames: {}
 device_identity: []
 community: []
@@ -290,37 +334,18 @@ expire_userlog: 365
 expire_nodeip_freshness: null
 store_wireless_clients: true
 store_modules: true
-ignore_interfaces:
-  - 'EOBC'
-  - 'unrouted VLAN(?: \d+)?'
-  - 'StackPort'
-  - 'Control Plane Interface'
-  - 'SPAN (S|R)P Interface'
-  - 'StackSub-.*'
-  - 'StackPort\d+'
-  - 'netflow'
-  - 'Vlan\d+-mpls layer'
-  - 'BRI\S+-Bearer Channel'
-  - 'BRI\S+-Physical'
-  - 'BRI\S+-Signalling'
-  - 'BRI\S+-Signaling'
-  - 'Embedded-Service-Engine\d+\/\d+'
-  - 'Virtual-Template\d+'
-  - 'Virtual-Access\d+'
-  - '(E|T)\d \d\/\d\/\d'
-  - 'InLoopback0'
-  - 'NULL\d'
-  - 'Register-Tunnel\d'
-  - 'Blade-Aggregation\d'
-  - 'M-GigabitEthernet\d\/\d\/\d'
-  - 'Ethernet(?:-| )QOS Packet Scheduler'
-  - 'Ethernet(?:-| )WFP (?:802\.3|Native) MAC Layer Lightweight Filter'
-  - 'ii\d\/\d\/\d+'
+ignore_deviceports:
+  'group:__ANY__':
+    - 'group:__IGNORE_INTERFACES__'
+    - 'group:__IGNORE_INTERFACE_TYPES__'
+    - 'group:__IGNORE_NOTPRESENT_TYPES__'
+  'vendor:juniper':
+    - 'subnet:128\.0\.0\.0/2'
+    - 'port:.+\.1638\d'
+    - 'port:.+\.3276\d'
+ignore_interfaces: []
 ignore_interface_types: []
-ignore_notpresent_types:
-  - 'ethernetCsmacd'
-  - 'tunnel'
-  - 'ieee8023adLag'
+ignore_notpresent_types: []
 ignore_private_nets: false
 reverse_sysname: false
 phone_capabilities:
@@ -357,7 +382,7 @@ jobs_qdepth: 50
 dns:
   max_outstanding: 50
   hosts_file: '/etc/hosts'
-  no: ['group:__LOCAL_ADDRESSES__','169.254.0.0/16','fe80::/10']
+  no: ['group:__LOCAL_ADDRESSES__','group:__LOOPBACK_ADDRESSES__']
 
 hooks: []