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

[#15] Undiscovered Neighbor report JOIN fixed, and updated to include

Browse Source 
the ports where Macsuck saw the MAC address of a known Device
This commit is contained in:
Oliver Gorwits
2015-01-01 18:38:39 +00:00
parent af24ecf57d
commit af16e1f4f9
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/Changes
View File

@@ -15,6 +15,8 @@
* Fix for node search on some formats of IPv6 addr being seen as MAC * Fix for node search on some formats of IPv6 addr being seen as MAC
* [#190] Ignore entries in the discover form that don't look like IP/hostname * [#190] Ignore entries in the discover form that don't look like IP/hostname
* Delete all job queue entries (regardless of status) when deleting device * Delete all job queue entries (regardless of status) when deleting device
* [#15] Undiscovered Neighbor report JOIN fixed, and updated to include
the ports where Macsuck saw the MAC address of a known Device
2.029014 - 2014-11-19 2.029014 - 2014-11-19

19
Netdisco/lib/App/Netdisco/DB/Result/Virtual/UndiscoveredNeighbors.pm
View File

@@ -22,14 +22,17 @@ __PACKAGE__->result_source_instance->view_definition(<<'ENDSQL');
a.log, a.log,
a.finished a.finished
FROM device_port p FROM device_port p
JOIN device d ON d.ip = p.ip JOIN device d
JOIN ADMIN a ON p.remote_ip = a.device ON d.ip = p.ip
WHERE p.remote_ip NOT IN LEFT JOIN admin a
(SELECT ALIAS ON (p.remote_ip = a.device AND a.action = 'discover')
FROM device_ip) WHERE
AND a.action = 'discover' (p.remote_ip NOT IN (SELECT alias FROM device_ip))
ORDER BY p.remote_ip, OR
a.finished DESC ((p.remote_ip IS NULL) AND p.is_uplink)
ORDER BY
p.remote_ip ASC,
a.finished DESC
ENDSQL ENDSQL
__PACKAGE__->add_columns( __PACKAGE__->add_columns(

19
Netdisco/share/views/ajax/admintask/undiscoveredneighbors.tt
View File

@@ -1,7 +1,7 @@
<table id="data-table" class="table table-striped table-bordered" width="100%" cellspacing="0"> <table id="data-table" class="table table-striped table-bordered" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th>Device Location Triggering<br>Last Discovery Attempt</th> <th>Observing Device</th>
<th>Undiscovered Neighbor</th> <th>Undiscovered Neighbor</th>
<th class="nd_center-cell">Last Discovery Attempt</th> <th class="nd_center-cell">Last Discovery Attempt</th>
<th class="nd_center-cell">Last Discovery Log</th> <th class="nd_center-cell">Last Discovery Log</th>
@@ -12,11 +12,18 @@
<tr> <tr>
<td><a href="[% device_ports %]&q=[% row.ip | uri %]&f=[% row.port | uri %]"> <td><a href="[% device_ports %]&q=[% row.ip | uri %]&f=[% row.port | uri %]">
[% row.dns || row.name || row.ip | html_entity %] ( [% row.port | html_entity %] ) </a></td> [% row.dns || row.name || row.ip | html_entity %] ( [% row.port | html_entity %] ) </a></td>
<td><a href="[% search_node %]&q=[% row.remote_ip | uri %]"> <td>
[% row.remote_ip | html_entity %]</a> [% IF row.remote_ip %]
([% row.remote_port | html_entity %]) <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
[% ' id: '_ row.remote_id IF row.remote_id %] [% row.remote_ip | html_entity %]
[% ' type: '_ row.remote_type IF row.remote_type %]</td> </a> ([% row.remote_port | html_entity %])
[% '<br />' IF row.remote_id or row.remote_type %]
[% ' id: '_ row.remote_id IF row.remote_id %]
[% ' type: '_ row.remote_type IF row.remote_type %]
[% ELSE %]
Known Device's MAC Address seen on this Port during Macsuck
[% END %]
</td>
<td class="nd_center-cell">[% row.finished | html_entity %]</td> <td class="nd_center-cell">[% row.finished | html_entity %]</td>
<td class="nd_center-cell">[% row.log | html_entity %]</td> <td class="nd_center-cell">[% row.log | html_entity %]</td>
</tr> </tr>

2
Netdisco/share/views/ajax/admintask/undiscoveredneighbors_csv.tt
View File

@@ -1,5 +1,5 @@
[% USE CSV -%] [% USE CSV -%]
[% CSV.dump([ 'Device Triggering Last Discovery Attempt' 'Device Port' [% CSV.dump([ 'Observing Device' 'Device Port'
'Remote IP' 'Remote Port' 'Remote ID' 'Remote Type' 'Remote IP' 'Remote Port' 'Remote ID' 'Remote Type'
'Last Discovery Attempt' 'Discovery Log']) %] 'Last Discovery Attempt' 'Discovery Log']) %]