diff --git a/Changes b/Changes index d1990918..16a1a4d8 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,25 @@ +2.038002 - 2018-01-02 + + [ENHANCEMENTS] + + * Use new release filename for netdisco-mibs + * Add favicon.ico from https://www.flickr.com/photos/7827976@N05/464520552 + + [BUG FIXES] + + * Change name of d3 javascript file to force browser reload + +2.038001 - 2018-01-02 + + [ENHANCEMENTS] + + * Better tooltip for netmap items + * Change to color10 set in netmap + + [BUG FIXES] + + * Allow statistics to be run on an empty database + 2.038000 - 2017-12-31 [NEW FEATURES] diff --git a/META.json b/META.json index 3695eb1a..fda8774d 100644 --- a/META.json +++ b/META.json @@ -105,7 +105,7 @@ "provides" : { "App::Netdisco" : { "file" : "lib/App/Netdisco.pm", - "version" : "2.038000" + "version" : "2.038001" }, "App::Netdisco::AnyEvent::Nbtstat" : { "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm" @@ -758,7 +758,7 @@ }, "homepage" : "http://netdisco.org/", "license" : [ - "http://opensource.org/licenses/BSD-3-Clause" + "http://opensource.org/licenses/bsd-license.php" ], "repository" : { "url" : "https://github.com/netdisco/netdisco" @@ -766,6 +766,6 @@ "x_IRC" : "irc://irc.freenode.org/#netdisco", "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users" }, - "version" : "2.038000", + "version" : "2.038001", "x_serialization_backend" : "JSON::PP version 2.94" } diff --git a/META.yml b/META.yml index 8eaf3bb9..8c72e540 100644 --- a/META.yml +++ b/META.yml @@ -18,7 +18,7 @@ name: App-Netdisco provides: App::Netdisco: file: lib/App/Netdisco.pm - version: '2.038000' + version: '2.038001' App::Netdisco::AnyEvent::Nbtstat: file: lib/App/Netdisco/AnyEvent/Nbtstat.pm App::Netdisco::Backend::Job: @@ -524,7 +524,7 @@ resources: MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users bugtracker: https://github.com/netdisco/netdisco/issues homepage: http://netdisco.org/ - license: http://opensource.org/licenses/BSD-3-Clause + license: http://opensource.org/licenses/bsd-license.php repository: https://github.com/netdisco/netdisco -version: '2.038000' +version: '2.038001' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff --git a/bin/netdisco-deploy b/bin/netdisco-deploy index e7106907..5d8f7bee 100755 --- a/bin/netdisco-deploy +++ b/bin/netdisco-deploy @@ -289,8 +289,8 @@ sub deploy_mibs { if ($resp->{url} =~ m/([0-9.]+)$/) { my $ver = $1; - my $url = 'https://codeload.github.com/netdisco/netdisco-mibs/tar.gz/'. $ver; - my $file = file($home, 'netdisco-mibs-latest.tar.gz'); + my $url = "https://github.com/netdisco/netdisco-mibs/releases/download/${ver}/netdisco-mibs.tar.gz"; + my $file = file($home, 'netdisco-mibs.tar.gz'); $resp = HTTP::Tiny->new->mirror($url, $file); if ($resp->{success}) { diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm index 4e862b31..8b643995 100644 --- a/lib/App/Netdisco.pm +++ b/lib/App/Netdisco.pm @@ -4,7 +4,7 @@ use strict; use warnings; use 5.010_000; -our $VERSION = '2.038000'; +our $VERSION = '2.038001'; use App::Netdisco::Configuration; =head1 NAME diff --git a/lib/App/Netdisco/Util/Statistics.pm b/lib/App/Netdisco/Util/Statistics.pm index 23966cd1..2e4e4d9f 100644 --- a/lib/App/Netdisco/Util/Statistics.pm +++ b/lib/App/Netdisco/Util/Statistics.pm @@ -47,7 +47,10 @@ sub update_stats { device_ip_count => $schema->resultset('DeviceIp')->count_rs->as_query, device_link_count => - $schema->resultset('Virtual::DeviceLinks')->get_column('aggports')->sum_rs->as_query, + $schema->resultset('Virtual::DeviceLinks')->search(undef, { + select => [ { coalesce => [ { sum => 'aggports' }, 0 ] } ], + as => ['totlinks'], + })->get_column('totlinks')->as_query, device_port_count => $schema->resultset('DevicePort')->count_rs->as_query, device_port_up_count => diff --git a/share/public/images/favicon.ico b/share/public/images/favicon.ico new file mode 100644 index 00000000..e3a53c00 Binary files /dev/null and b/share/public/images/favicon.ico differ diff --git a/share/public/javascripts/d3.min.js b/share/public/javascripts/d3-3.5.17.min.js similarity index 100% rename from share/public/javascripts/d3.min.js rename to share/public/javascripts/d3-3.5.17.min.js diff --git a/share/views/layouts/main.tt b/share/views/layouts/main.tt index 09df43d9..badeb7e9 100644 --- a/share/views/layouts/main.tt +++ b/share/views/layouts/main.tt @@ -3,7 +3,8 @@ - + + Netdisco @@ -21,7 +22,7 @@ - +