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

Merge branch 'master' of github.com:netdisco/netdisco

Browse Source
This commit is contained in:
Oliver Gorwits
2018-01-02 16:33:17 +00:00
parent 759d9b1a4e c5d3dd03ee
commit 24c2c802b8
9 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Changes
View File

@@ -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 2.038000 - 2017-12-31
[NEW FEATURES] [NEW FEATURES]

6
META.json
View File

@@ -105,7 +105,7 @@
"provides" : { "provides" : {
"App::Netdisco" : { "App::Netdisco" : {
"file" : "lib/App/Netdisco.pm", "file" : "lib/App/Netdisco.pm",
"version" : "2.038000" "version" : "2.038001"
}, },
"App::Netdisco::AnyEvent::Nbtstat" : { "App::Netdisco::AnyEvent::Nbtstat" : {
"file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm" "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -758,7 +758,7 @@
}, },
"homepage" : "http://netdisco.org/", "homepage" : "http://netdisco.org/",
"license" : [ "license" : [
"http://opensource.org/licenses/BSD-3-Clause" "http://opensource.org/licenses/bsd-license.php"
], ],
"repository" : { "repository" : {
"url" : "https://github.com/netdisco/netdisco" "url" : "https://github.com/netdisco/netdisco"
@@ -766,6 +766,6 @@
"x_IRC" : "irc://irc.freenode.org/#netdisco", "x_IRC" : "irc://irc.freenode.org/#netdisco",
"x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users" "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
}, },
"version" : "2.038000", "version" : "2.038001",
"x_serialization_backend" : "JSON::PP version 2.94" "x_serialization_backend" : "JSON::PP version 2.94"
} }

6
META.yml
View File

@@ -18,7 +18,7 @@ name: App-Netdisco
provides: provides:
App::Netdisco: App::Netdisco:
file: lib/App/Netdisco.pm file: lib/App/Netdisco.pm
version: '2.038000' version: '2.038001'
App::Netdisco::AnyEvent::Nbtstat: App::Netdisco::AnyEvent::Nbtstat:
file: lib/App/Netdisco/AnyEvent/Nbtstat.pm file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
App::Netdisco::Backend::Job: App::Netdisco::Backend::Job:
@@ -524,7 +524,7 @@ resources:
MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users
bugtracker: https://github.com/netdisco/netdisco/issues bugtracker: https://github.com/netdisco/netdisco/issues
homepage: http://netdisco.org/ 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 repository: https://github.com/netdisco/netdisco
version: '2.038000' version: '2.038001'
x_serialization_backend: 'CPAN::Meta::YAML version 0.018' x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

4
bin/netdisco-deploy
View File

@@ -289,8 +289,8 @@ sub deploy_mibs {
if ($resp->{url} =~ m/([0-9.]+)$/) { if ($resp->{url} =~ m/([0-9.]+)$/) {
my $ver = $1; my $ver = $1;
my $url = 'https://codeload.github.com/netdisco/netdisco-mibs/tar.gz/'. $ver; my $url = "https://github.com/netdisco/netdisco-mibs/releases/download/${ver}/netdisco-mibs.tar.gz";
my $file = file($home, 'netdisco-mibs-latest.tar.gz'); my $file = file($home, 'netdisco-mibs.tar.gz');
$resp = HTTP::Tiny->new->mirror($url, $file); $resp = HTTP::Tiny->new->mirror($url, $file);
if ($resp->{success}) { if ($resp->{success}) {

2
lib/App/Netdisco.pm
View File

@@ -4,7 +4,7 @@ use strict;
use warnings; use warnings;
use 5.010_000; use 5.010_000;
our $VERSION = '2.038000'; our $VERSION = '2.038001';
use App::Netdisco::Configuration; use App::Netdisco::Configuration;
=head1 NAME =head1 NAME

5
lib/App/Netdisco/Util/Statistics.pm
View File

@@ -47,7 +47,10 @@ sub update_stats {
device_ip_count => device_ip_count =>
$schema->resultset('DeviceIp')->count_rs->as_query, $schema->resultset('DeviceIp')->count_rs->as_query,
device_link_count => 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 => device_port_count =>
$schema->resultset('DevicePort')->count_rs->as_query, $schema->resultset('DevicePort')->count_rs->as_query,
device_port_up_count => device_port_up_count =>

BIN
share/public/images/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

0
share/public/javascripts/d3.min.js → share/public/javascripts/d3-3.5.17.min.js vendored
View File

5
share/views/layouts/main.tt
View File

@@ -3,7 +3,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=[% settings.charset | html_entity %]" /> <meta http-equiv="Content-type" content="text/html; charset=[% settings.charset | html_entity %]" />
<link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon"> <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon">
<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
<title>Netdisco</title> <title>Netdisco</title>
<!-- HTML5 shim, for IE6-8 support of HTML elements --> <!-- HTML5 shim, for IE6-8 support of HTML elements -->
@@ -21,7 +22,7 @@
<script type="text/javascript" src="[% uri_base %]/javascripts/bootstrap2-toggle.min.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/bootstrap2-toggle.min.js"></script>
<script type="text/javascript" src="[% uri_base %]/javascripts/underscore.min.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/underscore.min.js"></script>
<script type="text/javascript" src="[% uri_base %]/javascripts/jquery.qtip.min.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/jquery.qtip.min.js"></script>
<script type="text/javascript" src="[% uri_base %]/javascripts/d3.min.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/d3-3.5.17.min.js"></script>
<script type="text/javascript" src="[% uri_base %]/javascripts/d3-force-network-chart.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/d3-force-network-chart.js"></script>
<script type="text/javascript" src="[% uri_base %]/javascripts/toastr.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/toastr.js"></script>
<script type="text/javascript" src="[% uri_base %]/javascripts/jquery.floatThead.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/jquery.floatThead.js"></script>