From f50f63cc511631f337de3577822dc27bbf9de56f Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 2 Jan 2018 13:09:39 +0000 Subject: [PATCH 1/6] Allow statistics to be run on an empty database --- Changes | 11 +++++++++++ lib/App/Netdisco/Util/Statistics.pm | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index d1990918..cfc3d6db 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,14 @@ +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/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 => From dcd2106428d3eaaa7d047f9c56e248e5d414ec5b Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 2 Jan 2018 13:11:47 +0000 Subject: [PATCH 2/6] release 2.038001 --- META.json | 6 +++--- META.yml | 6 +++--- lib/App/Netdisco.pm | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) 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/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 From eee31ab541556f122cb7ddfc8a60a252b6f0dc9e Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 2 Jan 2018 14:18:35 +0000 Subject: [PATCH 3/6] cache bust previous d3 js file --- share/public/javascripts/{d3.min.js => d3-3.5.17.min.js} | 0 share/views/layouts/main.tt | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename share/public/javascripts/{d3.min.js => d3-3.5.17.min.js} (100%) 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..8b55545b 100644 --- a/share/views/layouts/main.tt +++ b/share/views/layouts/main.tt @@ -21,7 +21,7 @@ - + From 6c4988a3a24d75635ca88d2eaab5ac7483ee8dd0 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 2 Jan 2018 14:27:32 +0000 Subject: [PATCH 4/6] use new release filename for netdisco-mibs --- bin/netdisco-deploy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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}) { From 5873f4ef0638cd155645ad8728e31f5f3f99a806 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 2 Jan 2018 14:28:33 +0000 Subject: [PATCH 5/6] update changes --- Changes | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Changes b/Changes index cfc3d6db..1d0410a0 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,13 @@ +2.038002 - 2018-01-02 + + [ENHANCEMENTS] + + * Use new release filename for netdisco-mibs + + [BUG FIXES] + + * Change name of d3 javascript file to force browser reload + 2.038001 - 2018-01-02 [ENHANCEMENTS] From c5d3dd03eee8f906ef976f405f7be58acc3eae31 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 2 Jan 2018 14:35:15 +0000 Subject: [PATCH 6/6] Add favicon.ico from https://www.flickr.com/photos/7827976@N05/464520552 --- Changes | 1 + share/public/images/favicon.ico | Bin 0 -> 1150 bytes share/views/layouts/main.tt | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 share/public/images/favicon.ico diff --git a/Changes b/Changes index 1d0410a0..16a1a4d8 100644 --- a/Changes +++ b/Changes @@ -3,6 +3,7 @@ [ENHANCEMENTS] * Use new release filename for netdisco-mibs + * Add favicon.ico from https://www.flickr.com/photos/7827976@N05/464520552 [BUG FIXES] diff --git a/share/public/images/favicon.ico b/share/public/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..e3a53c00c00233a79f89e23b9a49f7ab150c123c GIT binary patch literal 1150 zcmbtT+e$KF6dlV#(MrukJ1Q00!9+9<{IXOYOT$Z{!J3G+p^}>rh%x1IHGa8NHG8havI5GAT9c>gt3C&*pGAB*y36-Cc~2k7I0X41T{K;cyt6o14OCZEX!lM@Mo#e%smE zDY`T_Hw!1m_V@Sk`1pvKnHfAiJ>ll&MmX?Hkw^roR0^3)M$SsU)P#C7m)cBBOyKnN z6x-X|xWB*0*Vh+*etz)&{*G)mEBLJCcDn_WIVO`y^2w*WyBmQ(Kzw<9eZ}|pH{Raf z@cH>E=clIBHWUhp=G48hv9ap!(9jU*jmP5=4;L2~1@q(ML-;H#EP!ixcv$o!HoYf* z`ZqT>hrYf(!S{N-@cDc=J3B+MSQOpZ57Z_Y3`&ntJL*tVQzKdsoA0PQy`Xpbd>*T- ztC*dgm0b20@rmtpI)w*yv{)>HeSCZ@x>qU{JU>5I^<>@A(NWCL&x?01mrHV(OAhqm z{QO+>y1u@~?d>fd9v-BZ*bD3lV)MDBrA0hoA2IJwgTuo^TwPs>_w=9IvnQsfrv;aD z!S6ddIz%td85ie_9LSyh{_^qy`geDChoz+@$!85>vtN6Ad!=WYOWmm-XMnxWd~(0I jxR4o~oSekS$cW?;x2LB^W|chXJ - + + Netdisco