diff --git a/Netdisco/Changes b/Netdisco/Changes index 86811bce..90dd86f3 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -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 diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm index a8e682de..7020925c 100644 --- a/Netdisco/lib/App/Netdisco.pm +++ b/Netdisco/lib/App/Netdisco.pm @@ -307,7 +307,7 @@ within the L documentation. =head1 Caveats -The Wireless, IP Phone and NetBIOS Node properies are not yet shown. +NetBIOS Node properies are not yet shown. =head1 AUTHOR diff --git a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod index 6f7ba875..43fac9f9 100644 --- a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod +++ b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod @@ -399,9 +399,10 @@ operations. See L for more info. Value: Boolean. Default: C. -Setting this to C 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 prevents bulkwalk of device tables with +non-increasing OIDs throwing an error C 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 diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm index e0d9af15..f1fd8f28 100644 --- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm +++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortMultiNodes.pm @@ -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;