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

basic implementation, rancid graph and nodemonitor missing

Browse Source
This commit is contained in:
Oliver Gorwits
2019-06-13 07:02:09 +01:00
parent 039527c26a
commit fed14bd810
6 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
View File

@@ -121,9 +121,9 @@ sub make_node_infostring {
sub make_link_infostring {
my $link = shift or return '';
my $domain = quotemeta( setting('domain_suffix') || '' );
(my $left_name = lc($link->{left_dns} || $link->{left_name} || $link->{left_ip})) =~ s/$domain$//;
(my $right_name = lc($link->{right_dns} || $link->{right_name} || $link->{right_ip})) =~ s/$domain$//;
my $domains = setting('domain_suffix');
(my $left_name = lc($link->{left_dns} || $link->{left_name} || $link->{left_ip})) =~ s/$domains//;
(my $right_name = lc($link->{right_dns} || $link->{right_name} || $link->{right_ip})) =~ s/$domains//;
my @zipped = List::MoreUtils::zip6
@{$link->{left_port}}, @{$link->{left_descr}},
@@ -163,7 +163,7 @@ ajax '/ajax/data/device/netmap' => require_login sub {
my %logvals = ();
my %metadata = ();
my %data = ( nodes => [], links => [] );
my $domain = quotemeta( setting('domain_suffix') || '' );
my $domains = setting('domain_suffix');
# LINKS
@@ -236,7 +236,7 @@ ajax '/ajax/data/device/netmap' => require_login sub {
keys %{ setting('host_group_displaynames') || {} };
++$logvals{ $device->get_column('log') || 1 };
(my $name = lc($device->dns || $device->name || $device->ip)) =~ s/$domain$//;
(my $name = lc($device->dns || $device->name || $device->ip)) =~ s/$domains//;
my %color_lkp = (
speed => (($device->get_column('log') || 1) * 1000),

2
lib/App/Netdisco/Web/Plugin/Report/DeviceDnsMismatch.pm
View File

@@ -16,7 +16,7 @@ register_report(
get '/ajax/content/report/devicednsmismatch' => require_login sub {
my $suffix = setting('domain_suffix') || '';
my $suffix = setting('domain_suffix');
my @results
= schema('netdisco')->resultset('Virtual::DeviceDnsMismatch')

10
lib/App/Netdisco/Web/Plugin/Search/Node.pm
View File

@@ -166,11 +166,13 @@ ajax '/ajax/content/search/node' => require_login sub {
->search_by_ip({ip => $ip, @active, @times});
}
else {
$likeval .= setting('domain_suffix')
if index($node, setting('domain_suffix')) == -1;
$set = schema('netdisco')->resultset('NodeIp')
->search_by_dns({dns => $likeval, @active, @times});
->search_by_dns({
dns => $likeval,
suffix => setting('domain_suffix'),
@active,
@times,
});
# if the user selects Vendor search opt, then
# we'll try the OUI company name as a fallback