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

#274 errors in IP Inventory report

Browse Source
This commit is contained in:
Oliver Gorwits
2018-03-10 11:32:02 +00:00
parent a2269c469f
commit 9fa8372685
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Changes
View File

@@ -2,13 +2,17 @@
[NEW FEATURES] [NEW FEATURES]
* Node Montior is now included in Admin menu
* #48 Node Monitor supports matching on OUI * #48 Node Monitor supports matching on OUI
* #31 Configurable Free Time in Port Utilization Report * #31 configurable Free Time in Port Utilization Report
[ENHANCEMENTS] [ENHANCEMENTS]
* #24 Show device age in device search view * #24 show device age in device search view
* Node Montior is now included in Admin menu
[BUG FIXES]
* #274 errors in IP Inventory report
2.039015 - 2018-03-05 2.039015 - 2018-03-05

2
lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm
View File

@@ -12,7 +12,7 @@ __PACKAGE__->table('cidr_ips');
__PACKAGE__->result_source_instance->is_virtual(1); __PACKAGE__->result_source_instance->is_virtual(1);
__PACKAGE__->result_source_instance->view_definition(<<'ENDSQL'); __PACKAGE__->result_source_instance->view_definition(<<'ENDSQL');
SELECT host(network (prefix) + sub.int)::inet AS ip, SELECT host(network (prefix) + sub.int)::inet AS ip,
NULL AS mac, NULL::macaddr AS mac,
NULL::text AS dns, NULL::text AS dns,
NULL::timestamp AS time_first, NULL::timestamp AS time_first,
NULL::timestamp AS time_last, NULL::timestamp AS time_last,

4
lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm
View File

@@ -19,7 +19,7 @@ get '/ajax/content/report/ipinventory' => require_login sub {
# Default to something simple with no results to prevent # Default to something simple with no results to prevent
# "Search failed!" error # "Search failed!" error
my $subnet = param('subnet') || '0.0.0.0/32'; (my $subnet = (param('subnet') || '0.0.0.0/32')) =~ s/\s//g;
$subnet = NetAddr::IP::Lite->new($subnet); $subnet = NetAddr::IP::Lite->new($subnet);
$subnet = NetAddr::IP::Lite->new('0.0.0.0/32') $subnet = NetAddr::IP::Lite->new('0.0.0.0/32')
if (! $subnet) or ($subnet->addr eq '0.0.0.0'); if (! $subnet) or ($subnet->addr eq '0.0.0.0');
@@ -41,7 +41,7 @@ get '/ajax/content/report/ipinventory' => require_login sub {
{ join => 'device', { join => 'device',
select => [ select => [
'alias AS ip', 'alias AS ip',
\'NULL as mac', \'NULL::macaddr as mac',
'creation AS time_first', 'creation AS time_first',
'device.last_discover AS time_last', 'device.last_discover AS time_last',
'dns', 'dns',