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

Merge branch 'og-2.040'

Browse Source
This commit is contained in:
Oliver Gorwits
2018-05-09 06:50:55 +01:00
parent a97780201d d959adde36
commit 87f1297f25
9 changed files with 105 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/App/Netdisco/DB.pm
View File

@@ -11,7 +11,7 @@ __PACKAGE__->load_namespaces(
);
our # try to hide from kwalitee
$VERSION = 52; # schema version used for upgrades, keep as integer
$VERSION = 53; # schema version used for upgrades, keep as integer
use Path::Class;
use File::ShareDir 'dist_dir';
@@ -20,7 +20,7 @@ our $schema_versions_dir = Path::Class::Dir->new( dist_dir('App-Netdisco') )
->subdir('schema_versions')->stringify;
__PACKAGE__->load_components(qw/
Schema::Versioned
+App::Netdisco::DB::SchemaVersioned
+App::Netdisco::DB::ExplicitLocking
/);

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

@@ -11,28 +11,32 @@ __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
FROM device_port p
JOIN device d
ON d.ip = p.ip
LEFT 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)
ORDER BY
p.remote_ip ASC,
a.finished DESC
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
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
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
__PACKAGE__->add_columns(
@@ -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",

17
lib/App/Netdisco/DB/SchemaVersioned.pm Normal file
View File

@@ -0,0 +1,17 @@
package App::Netdisco::DB::SchemaVersioned;
use strict;
use warnings;
use base 'DBIx::Class::Schema::Versioned';
use Try::Tiny;
use DBIx::Class::Carp;
sub apply_statement {
my ($self, $statement) = @_;
try { $self->storage->txn_do(sub { $self->storage->dbh->do($statement) }) }
catch { carp "SQL was: $statement" if $ENV{DBIC_TRACE} };
}
1;

2
lib/App/Netdisco/Web/AdminTask.pm
View File

@@ -16,7 +16,7 @@ sub add_job {
return if
($device and (!$net or $net->num == 0 or $net->addr eq '0.0.0.0'));
my @hostlist = defined $device ? ($net->hostenum) : (undef);
my @hostlist = $device ? ($net->hostenum) : (undef);
jq_insert([map {{
($_ ? (device => $_->addr) : ()),

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 };
}
};

3
lib/App/Netdisco/Web/Plugin/Device/Ports.pm
View File

@@ -63,11 +63,12 @@ get '/ajax/content/device/ports' => require_login sub {
}
if (($prefer eq 'port') or not $prefer and
$set->search({'me.port' => $f})->count) {
$set->search({-or => ['me.port' => $f, 'me.descr' => $f]})->count) {
$set = $set->search({
-or => [
'me.port' => $f,
'me.descr' => $f,
'me.slave_of' => $f,
],
});