complete the migration of connected device ID to connected inventory
This commit is contained in:
Oliver Gorwits
@@ -122,17 +122,18 @@ sidebar_defaults:
|
||||
c_neighbors: { label: 'Connected Devices', default: checked, idx: 17 }
|
||||
c_stp: { label: 'Spanning Tree', default: null, idx: 18 }
|
||||
c_up: { label: 'Status', default: null, idx: 19 }
|
||||
n_age: { label: 'Age Stamp', default: null, idx: 0 }
|
||||
n_ip4: { label: 'IPv4 Addresses', default: checked, idx: 1 }
|
||||
n_ip6: { label: 'IPv6 Addresses', default: checked, idx: 2 }
|
||||
n_netbios: { label: 'NetBIOS Name', default: checked, idx: 3 }
|
||||
n_ssid: { label: 'SSID', default: checked, idx: 4 }
|
||||
n_vendor: { label: 'Vendor', default: null, idx: 5 }
|
||||
n_archived: { label: 'Archived Data', default: null, idx: 6 }
|
||||
mac_format: { default: IEEE }
|
||||
n_inventory: { label: 'Inventory Data', default: checked, idx: 0 }
|
||||
n_detailed_inventory: { label: 'Detailed Inventory', default: null, idx: 1 }
|
||||
n_age: { label: 'Age Stamp', default: null, idx: 2 }
|
||||
n_ip4: { label: 'IPv4 Addresses', default: checked, idx: 3 }
|
||||
n_ip6: { label: 'IPv6 Addresses', default: checked, idx: 4 }
|
||||
n_netbios: { label: 'NetBIOS Name', default: checked, idx: 5 }
|
||||
n_ssid: { label: 'SSID', default: checked, idx: 6 }
|
||||
n_vendor: { label: 'Vendor', default: null, idx: 7 }
|
||||
n_archived: { label: 'Archived Data', default: null, idx: 8 }
|
||||
age_num: { default: 3 }
|
||||
age_unit: { default: months }
|
||||
mac_format: { default: IEEE }
|
||||
neigh_id: { default: null }
|
||||
device_netmap:
|
||||
showips: { default: null }
|
||||
showspeed: { default: null }
|
||||
|
||||
@@ -267,9 +267,9 @@
|
||||
[% IF params.c_neighbors AND (row.remote_ip OR row.is_uplink) %]
|
||||
[% IF row.get_column('neighbor_ip') %]
|
||||
<i class="icon-link[% ' text-warning' IF row.manual_topo %]"></i>
|
||||
[% IF row.remote_type AND row.remote_type.match('(?i)ip.phone') %]
|
||||
[% IF row.remote_is_phone %]
|
||||
<i class="icon-phone"></i>
|
||||
[% ELSIF row.remote_type AND row.remote_type.match('^AP:\s') %]
|
||||
[% ELSIF row.remote_is_wap %]
|
||||
<i class="icon-signal"></i>
|
||||
[% END %]
|
||||
<a href="[% device_ports %]&q=[% row.get_column('neighbor_ip') | uri %]">
|
||||
@@ -280,21 +280,27 @@
|
||||
[% row.remote_port | html_entity %]</a>
|
||||
[% END %]
|
||||
<br/>
|
||||
[% IF params.neigh_id and (row.remote_id or row.remote_type) %]
|
||||
[% IF params.n_inventory and row.remote_inventory %]
|
||||
[% row.remote_inventory %]<br/>
|
||||
[% END %]
|
||||
[% IF params.n_detailed_inventory and (row.remote_id or row.remote_type) %]
|
||||
([% 'id: '_ row.remote_id IF row.remote_id %]
|
||||
[% ' type: '_ row.remote_type IF row.remote_type %])<br/>
|
||||
[% END %]
|
||||
[% ELSIF row.remote_ip %]
|
||||
<i class="icon-unlink text-error"></i>
|
||||
[% IF row.remote_type AND row.remote_type.match('(?i)ip.phone') %]
|
||||
[% IF row.remote_is_phone %]
|
||||
<i class="icon-phone"></i>
|
||||
[% ELSIF row.remote_type AND row.remote_type.match('^AP:\s') %]
|
||||
[% ELSIF row.remote_is_wap %]
|
||||
<i class="icon-signal"></i>
|
||||
[% END %]
|
||||
<a href="[% search_node %]&q=[% row.remote_ip | uri %]">
|
||||
[% row.remote_ip | html_entity %]
|
||||
[% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/>
|
||||
[% IF params.neigh_id and (row.remote_id or row.remote_type) %]
|
||||
[% IF params.n_inventory and row.remote_inventory %]
|
||||
[% row.remote_inventory %]<br/>
|
||||
[% END %]
|
||||
[% IF params.n_detailed_inventory and (row.remote_id or row.remote_type) %]
|
||||
([% 'id: '_ row.remote_id IF row.remote_id %]
|
||||
[% ' type: '_ row.remote_type IF row.remote_type %])<br/>
|
||||
[% END %]
|
||||
@@ -306,10 +312,9 @@
|
||||
[% FOREACH node IN row.$nodes %]
|
||||
[% '<br/>' IF (row.remote_ip OR row.is_uplink) OR NOT loop.first %]
|
||||
[% '<i class="icon-book"></i> ' IF NOT node.active %]
|
||||
[% IF row.remote_type AND row.remote_type.match('(?i)ip.phone') %]
|
||||
[% IF row.remote_is_phone %]
|
||||
<i class="icon-phone"></i>
|
||||
[% ELSIF node.wireless.defined
|
||||
OR (row.remote_type AND row.remote_type.match('^AP:\s')) %]
|
||||
[% ELSIF node.wireless.defined OR row.remote_is_wap %]
|
||||
<i class="icon-signal"></i>
|
||||
[% END %]
|
||||
<a href="[% search_node %]&q=[% node.net_mac.$mac_format_call | uri %]">
|
||||
|
||||
@@ -75,6 +75,33 @@
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<span data-toggle="collapse" data-target="#nd_nodeprops">
|
||||
<label class="nd_collapser">Node Properties
|
||||
<i class="nd_arrow-up-down-right icon-chevron-up icon-large"></i>
|
||||
</label></span>
|
||||
<div id="nd_nodeprops" class="collapse">
|
||||
<ul class="nd_inputs-list unstyled">
|
||||
<li>
|
||||
<em class="muted">MAC address format:</em><br/>
|
||||
<select id="nd_mac-format" name="mac_format">
|
||||
[% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
|
||||
<option[% ' selected="selected"' IF vars.sidebar_defaults.device_ports.mac_format == format %]>[% format %]</option>
|
||||
[% END %]
|
||||
</select>
|
||||
</li>
|
||||
[% FOREACH item IN settings.connected_properties %]
|
||||
<li>
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" id="[% item.name | html_entity %]"
|
||||
name="[% item.name | html_entity %]"[% ' checked="checked"' IF vars.sidebar_defaults.device_ports.${item.name} %] />
|
||||
[% item.label | html_entity %]
|
||||
</label>
|
||||
</li>
|
||||
[% END %]
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<span data-toggle="collapse" data-target="#nd_portprops">
|
||||
<label class="nd_collapser">Port Properties
|
||||
@@ -106,40 +133,6 @@
|
||||
</select>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" id="neigh_id"
|
||||
name="neigh_id"[% ' checked="checked"' IF vars.sidebar_defaults.device_ports.neigh_id %] />
|
||||
Connected Device ID
|
||||
</label>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<span data-toggle="collapse" data-target="#nd_nodeprops">
|
||||
<label class="nd_collapser">Node Properties
|
||||
<i class="nd_arrow-up-down-right icon-chevron-up icon-large"></i>
|
||||
</label></span>
|
||||
<div id="nd_nodeprops" class="collapse">
|
||||
<ul class="nd_inputs-list unstyled">
|
||||
<li>
|
||||
<em class="muted">MAC address format:</em><br/>
|
||||
<select id="nd_mac-format" name="mac_format">
|
||||
[% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
|
||||
<option[% ' selected="selected"' IF vars.sidebar_defaults.device_ports.mac_format == format %]>[% format %]</option>
|
||||
[% END %]
|
||||
</select>
|
||||
</li>
|
||||
[% FOREACH item IN settings.connected_properties %]
|
||||
<li>
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" id="[% item.name | html_entity %]"
|
||||
name="[% item.name | html_entity %]"[% ' checked="checked"' IF vars.sidebar_defaults.device_ports.${item.name} %] />
|
||||
[% item.label | html_entity %]
|
||||
</label>
|
||||
</li>
|
||||
[% END %]
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user