135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide NetBIOS information when available in Node and Port views

Browse Source
This commit is contained in:
Eric A. Miller
2014-02-08 20:50:35 -05:00
parent 79cc9622b2
commit 1739108717
8 changed files with 97 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/share/views/ajax/device/ports.tt
View File

@@ -301,6 +301,12 @@
[% END %]
[% END %]
[% END %]
[% IF params.n_netbios %]
[% FOREACH nbt IN node.netbios %]
<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\\<a href="ip_search.html?domain=[% nbt.domain | uri %]&cmd=nbt" title="Devices in this Domain">[% nbt.domain | html %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a>
<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[% nbt.nbuser || '[No User]' | html %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a>
[% END %]
[% END %]
[% END %]
[% END %]
</td>

36
Netdisco/share/views/ajax/search/node_by_ip.tt
View File

@@ -1,3 +1,4 @@
[% USE date(format = '%Y-%m-%d %H:%M') %]
<table class="table table-bordered table-hover nd_floatinghead">
<thead>
<tr>
@@ -52,6 +53,41 @@
<td>[% node.time_last_stamp | html_entity %]</td>
[% END %]
</tr>
[% FOREACH nbt IN node.netbios %]
<tr>
<td>&nbsp;</td>
[% IF params.show_vendor %]
<td>&nbsp;</td>
[% END %]
<td>NetBIOS</td>
<td class="nd_linkcell">\\<a href="[% uri_for('report/netbios') %]?domain=[% nbt.domain | uri %]" title="Devices in this Domain">[% nbt.domain | html %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a>
<br>[% nbt.nbuser || '[No User]' | html %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a>
</td>
[% IF params.stamps %]
<td>[% date.format(nbt.time_first) | html_entity %]</td>
<td>[% date.format(nbt.time_last) | html_entity %]</td>
[% END %]
</tr>
[% END %]
[% FOREACH wlan IN node.wireless %]
<tr>
<td>&nbsp;</td>
[% IF params.show_vendor %]
<td>&nbsp;</td>
[% END %]
<td>Wireless Info</td>
<td class="nd_center-cell">SSID: [% wlan.ssid | html_entity %]<br>
MaxRate: [% wlan.maxrate | html_entity %]Mbps TxRate: [% wlan.txrate | html_entity %]Mbps<br>
SigStr: [% wlan.sigstrength | html_entity %] SigQual: [% wlan.sigqual | html_entity %]<br>
Rx: [% wlan.rxpkt | format_number %] pkts, [% wlan.rxbyte | format_number %] bytes<br>
Tx: [% wlan.txpkt | format_number %] pkts, [% wlan.txbyte | format_number %] bytes<br>
</td>
[% IF params.stamps %]
<td> &nbsp; </td>
<td>[% date.format(wlan.time_last) | html_entity %]</td>
[% END %]
</tr>
[% END %]
[% END %]
[% FOREACH nodeip IN row.ip_aliases(archive_filter) %]
<tr>

26
Netdisco/share/views/ajax/search/node_by_mac.tt
View File

@@ -118,6 +118,32 @@
</tr>
[% SET first_row = 0 %]
[% END %]
[% WHILE (nbt = netbios.next) %]
<tr>
<td>
[% IF first_row %]
<a class="nd_linkcell"
href="[% search_node %]&q=[% nbt.mac | uri %]">[% nbt.mac | html_entity %]</a>
[% ELSE %]
&nbsp;
[% END %]
</td>
[% IF params.show_vendor %]
<td>
&nbsp;
</td>
[% END %]
<td>NetBIOS</td>
<td class="nd_linkcell">\\<a href="[% uri_for('report/netbios') %]?domain=[% nbt.domain | uri %]" title="Devices in this Domain">[% nbt.domain | html %]</a>\<a href="[% search_node %]&q=[% nbt.nbname | uri %]">[% nbt.nbname | html_entity %]</a>
<br>[% nbt.nbuser || '[No User]' | html %]@<a href="[% search_node %]&q=[% nbt.ip | uri %]">[% nbt.ip | html_entity %]</a>
</td>
[% IF params.stamps %]
<td>[% nbt.get_column('time_first_stamp') | html_entity %]</td>
<td>[% nbt.get_column('time_last_stamp') | html_entity %]</td>
[% END %]
</tr>
[% SET first_row = 0 %]
[% END %]
[% WHILE (wlan = wireless.next) %]
<tr>
<td>