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

#410 improvements to Undiscovered Neighbors report

Browse Source
This commit is contained in:
Oliver Gorwits
2018-05-07 17:15:11 +01:00
parent 232df96457
commit 6098b893ad
4 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@@ -3,6 +3,7 @@
[ENHANCEMENTS]
* #408 improvements to MakeRancidConf (earendilfr)
* #410 improvements to Undiscovered Neighbors report
2.039028 - 2018-05-05

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

@@ -11,27 +11,31 @@ __PACKAGE__->table_class('DBIx::Class::ResultSource::View');
__PACKAGE__->table('undiscovered_neighbors');
__PACKAGE__->result_source_instance->is_virtual(1);
__PACKAGE__->result_source_instance->view_definition(<<'ENDSQL');
SELECT DISTINCT ON (p.remote_ip) d.ip,
d.name,
d.dns,
p.port,
p.remote_ip,
p.remote_id,
p.remote_type,
p.remote_port,
a.log,
a.finished
SELECT DISTINCT ON (p.remote_ip, p.port)
d.ip, d.name, d.dns,
p.port, p.name AS port_description,
p.remote_ip, p.remote_id, p.remote_type, p.remote_port,
l.log AS comment,
a.log, a.finished
FROM device_port p
JOIN device d
ON d.ip = p.ip
LEFT JOIN admin a
INNER JOIN device d USING (ip)
LEFT OUTER JOIN device_skip ds
ON ('discover' = ANY(ds.actionset) AND p.remote_ip = ds.device)
LEFT OUTER JOIN device_port_log l USING (ip, port)
LEFT OUTER JOIN admin a
ON (p.remote_ip = a.device AND a.action = 'discover')
WHERE
(p.remote_ip NOT IN (SELECT alias FROM device_ip))
OR
((p.remote_ip IS NULL) AND p.is_uplink)
ds.device IS NULL
AND ((p.remote_ip NOT IN (SELECT alias FROM device_ip))
OR ((p.remote_ip IS NULL) AND p.is_uplink))
ORDER BY
p.remote_ip ASC,
p.port ASC,
l.creation DESC,
a.finished DESC
ENDSQL
@@ -44,6 +48,8 @@ __PACKAGE__->add_columns(
{ data_type => "text", is_nullable => 1 },
"port",
{ data_type => "text", is_nullable => 0 },
"port_description",
{ data_type => "text", is_nullable => 0 },
"remote_ip",
{ data_type => "inet", is_nullable => 1 },
"remote_port",
@@ -52,6 +58,8 @@ __PACKAGE__->add_columns(
{ data_type => "text", is_nullable => 1 },
"remote_id",
{ data_type => "text", is_nullable => 1 },
"comment",
{ data_type => "text", is_nullable => 1 },
"log",
{ data_type => "text", is_nullable => 1 },
"finished",

21
lib/App/Netdisco/Web/Plugin/AdminTask/UndiscoveredNeighbors.pm
View File

@@ -18,29 +18,28 @@ register_admin_task(
get '/ajax/content/admin/undiscoveredneighbors' => require_role admin => sub {
my @results
= schema('netdisco')->resultset('Virtual::UndiscoveredNeighbors')
->order_by('ip')->hri->all;
= schema('netdisco')->resultset('Virtual::UndiscoveredNeighbors')->hri->all;
return unless scalar @results;
# Don't include devices excluded from discovery by config
# but only if the number of devices is small, as it triggers a
# SELECT per device to check.
if (scalar @results < 50) {
@results
= grep { is_discoverable( $_->{'remote_ip'}, $_->{'remote_type'} ) }
@results;
my @discoverable_results = ();
foreach my $r (@results) {
# create a new row object to avoid hitting the DB in get_device()
my $dev = schema('netdisco')->resultset('Device')->new({ip => $r->{remote_ip}});
next unless is_discoverable( $dev, $r->{remote_type} );
push @discoverable_results, $r;
}
return unless scalar @results;
return unless scalar @discoverable_results;
if ( request->is_ajax ) {
template 'ajax/admintask/undiscoveredneighbors.tt',
{ results => \@results, },
{ results => \@discoverable_results, },
{ layout => undef };
}
else {
header( 'Content-Type' => 'text/comma-separated-values' );
template 'ajax/admintask/undiscoveredneighbors_csv.tt',
{ results => \@results, },
{ results => \@discoverable_results, },
{ layout => undef };
}
};

34
share/views/ajax/admintask/undiscoveredneighbors.tt
View File

@@ -1,31 +1,29 @@
<table id="data-table" class="table table-striped table-bordered" width="100%" cellspacing="0">
<thead>
<tr>
<th>Observing Device</th>
<th>Observing Interface</th>
<th>Undiscovered Neighbor</th>
<th class="nd_center-cell">Last Discovery Attempt</th>
<th class="nd_center-cell">Last Discovery Log</th>
<th>Neighbor ID</th>
<th nowrap>Last Discovery</th>
</tr>
</thead>
</tbody>
[% FOREACH row IN results %]
[% NEXT IF NOT row.remote_ip %]
<tr>
<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>
<td>
[% IF row.remote_ip %]
<a href="[% search_node %]&q=[% row.remote_ip | uri %]">
[% row.remote_ip | html_entity %]
</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 nowrap><a href="[% device_ports %]&q=[% row.ip | uri %]">
[% row.dns || row.name || row.ip | html_entity %]</a><br>
<a href="[% device_ports %]&q=[% row.ip | uri %]&f=[% row.port | uri %]">
[% row.port | html_entity %]</a>
[% IF row.port_description %]<br>[% row.port_description | html_entity %][% END %]
[% IF row.comment %]<br>&quot;<em>[% row.comment | html_entity %]</em>&quot;[% END %]
</td>
<td class="nd_center-cell">[% row.finished | html_entity %]</td>
<td class="nd_center-cell">[% row.log | html_entity %]</td>
<td nowrap><a href="[% search_node %]&q=[% row.remote_ip | uri %]">
[% row.remote_ip | html_entity %]</a><br>
[% row.remote_port | html_entity %]</td>
<td>[% row.remote_id | html_entity %]<br>
[% row.remote_type | remove('(?:(?:C|c)opyright\s+)?\(c\).*') | remove('Technical Support: http://.*') | html_entity | html_line_break %]</td>
<td nowrap>[% row.finished | html_entity %]<br>[% row.log | html_entity %]</td>
</tr>
[% END %]
</tbody>