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

Merge branch 'master' of ssh://git.code.sf.net/p/netdisco/netdisco-ng into og-agg

Browse Source
This commit is contained in:
Oliver Gorwits
2014-01-19 15:48:41 +00:00
parent 37d9bda2bb 3fdf7802b6
commit 6d16cddaab
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -20,6 +20,7 @@
* Correct is_discoverable check in Undiscovered Neighbors report
* Correct macsuck for Q-BRIDGE-MIB based devices
* Allow cached SNMP community hint to override SNMP version cycle
* [#76] Don't include wireless in ports with multiple nodes attached report
2.021000 - 2014-01-08

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

@@ -307,7 +307,7 @@ within the L<Developer|App::Netdisco::Manual::Developing> documentation.
=head1 Caveats
The Wireless, IP Phone and NetBIOS Node properies are not yet shown.
NetBIOS Node properies are not yet shown.
=head1 AUTHOR

7
Netdisco/lib/App/Netdisco/Manual/Configuration.pod
View File

@@ -399,9 +399,10 @@ operations. See L<SNMP> for more info.
Value: Boolean. Default: C<false>.
Setting this to C<true> will allow the bulkwalk of devices that have tables
with non-increasing OIDs. The default is to not allow this behavior, to
prevent discovery on problem devices from looping indefinitely. Requires
Setting this to C<true> prevents bulkwalk of device tables with
non-increasing OIDs throwing an error C<OID not increasing> when encountered.
The default is to allow non-increasing OIDs during bulkwalk (which may, in
very badly performing SNMP agents, result in a never-ending loop). Requires
Net-SNMP 5.3 or higher.
=head3 C<snmpver>

12
Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm
View File

@@ -16,10 +16,12 @@ register_report(
get '/ajax/content/report/portmultinodes' => require_login sub {
my @results = schema('netdisco')->resultset('Device')->search(
{ 'ports.remote_ip' => undef, 'nodes.active' => 1 },
{ result_class => 'DBIx::Class::ResultClass::HashRefInflator',
select => [ 'ip', 'dns', 'name' ],
join => { 'ports' => 'nodes' },
{ 'ports.remote_ip' => undef,
'nodes.active' => 1,
'wireless.port' => undef
},
{ select => [ 'ip', 'dns', 'name' ],
join => { 'ports' => [ 'wireless', 'nodes' ] },
'+columns' => [
{ 'port' => 'ports.port' },
{ 'description' => 'ports.name' },
@@ -29,7 +31,7 @@ get '/ajax/content/report/portmultinodes' => require_login sub {
having => \[ 'count(nodes.mac) > ?', [ count => 1 ] ],
order_by => { -desc => [qw/count/] },
}
)->all;
)->hri->all;
return unless scalar @results;