diff --git a/Netdisco/Changes b/Netdisco/Changes index a5daeaae..bfba5a8c 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -1,4 +1,4 @@ -2.007000_002 - +2.007000_002 - 2013-06-03 [NEW FEATURES] @@ -28,6 +28,7 @@ * Support 'path' config option as alternative to --path /mountpoint * Local plugins can be placed in ${NETDISCO_HOME}/site_plugins/... * Missing mibdirs causes all MIBs to be loaded (with a warning) + * Include qtip2 libraries [BUG FIXES] diff --git a/Netdisco/MANIFEST b/Netdisco/MANIFEST index 75ea3a6d..f6414979 100644 --- a/Netdisco/MANIFEST +++ b/Netdisco/MANIFEST @@ -1,4 +1,5 @@ bin/nd-dbic-versions +bin/nd-import-topology bin/netdisco-daemon bin/netdisco-daemon-fg bin/netdisco-db-deploy @@ -18,18 +19,24 @@ inc/Module/Install/Share.pm inc/Module/Install/Win32.pm inc/Module/Install/WriteAll.pm lib/App/Netdisco.pm +lib/App/Netdisco/Core/Arpnip.pm +lib/App/Netdisco/Core/Discover.pm +lib/App/Netdisco/Core/Macsuck.pm lib/App/Netdisco/Daemon/DB.pm lib/App/Netdisco/Daemon/DB/Result/Admin.pm lib/App/Netdisco/Daemon/Queue.pm +lib/App/Netdisco/Daemon/Util.pm lib/App/Netdisco/Daemon/Worker/Interactive.pm lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm -lib/App/Netdisco/Daemon/Worker/Interactive/Util.pm lib/App/Netdisco/Daemon/Worker/Manager.pm lib/App/Netdisco/Daemon/Worker/Poller.pm -lib/App/Netdisco/Daemon/Worker/Poller/Discover.pm +lib/App/Netdisco/Daemon/Worker/Poller/Arpnip.pm +lib/App/Netdisco/Daemon/Worker/Poller/Device.pm +lib/App/Netdisco/Daemon/Worker/Poller/Macsuck.pm lib/App/Netdisco/Daemon/Worker/Scheduler.pm lib/App/Netdisco/DB.pm +lib/App/Netdisco/DB/ExplicitLocking.pm lib/App/Netdisco/DB/Result/Admin.pm lib/App/Netdisco/DB/Result/Device.pm lib/App/Netdisco/DB/Result/DeviceIp.pm @@ -63,10 +70,13 @@ lib/App/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm lib/App/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm lib/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm +lib/App/Netdisco/DB/ResultSet/Admin.pm lib/App/Netdisco/DB/ResultSet/Device.pm lib/App/Netdisco/DB/ResultSet/DevicePort.pm lib/App/Netdisco/DB/ResultSet/Node.pm lib/App/Netdisco/DB/ResultSet/NodeIp.pm +lib/App/Netdisco/DB/ResultSet/NodeWireless.pm +lib/App/Netdisco/DB/ResultSet/Subnet.pm lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-1-2-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-1-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-10-11-PostgreSQL.sql @@ -77,7 +87,10 @@ lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-14-15-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-15-16-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-16-17-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-16-PostgreSQL.sql +lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-17-18-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-17-PostgreSQL.sql +lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-18-19-PostgreSQL.sql +lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-19-20-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-2-3-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-2-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-4-PostgreSQL.sql @@ -88,20 +101,26 @@ lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-PostgreSQL.sql lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql +lib/App/Netdisco/Manual/Configuration.pod lib/App/Netdisco/Manual/Deployment.pod lib/App/Netdisco/Manual/Developing.pod lib/App/Netdisco/Manual/ReleaseNotes.pod lib/App/Netdisco/Manual/WritingPlugins.pod lib/App/Netdisco/Util/Device.pm -lib/App/Netdisco/Util/DiscoverAndStore.pm lib/App/Netdisco/Util/DNS.pm lib/App/Netdisco/Util/Port.pm +lib/App/Netdisco/Util/PortMAC.pm +lib/App/Netdisco/Util/SanityCheck.pm lib/App/Netdisco/Util/SNMP.pm lib/App/Netdisco/Util/Web.pm lib/App/Netdisco/Web.pm +lib/App/Netdisco/Web/AdminTask.pm lib/App/Netdisco/Web/AuthN.pm lib/App/Netdisco/Web/Device.pm lib/App/Netdisco/Web/Plugin.pm +lib/App/Netdisco/Web/Plugin/AdminTask/JobQueue.pm +lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm +lib/App/Netdisco/Web/Plugin/AdminTask/Topology.pm lib/App/Netdisco/Web/Plugin/Device/Addresses.pm lib/App/Netdisco/Web/Plugin/Device/Details.pm lib/App/Netdisco/Web/Plugin/Device/Modules.pm @@ -116,7 +135,9 @@ lib/App/Netdisco/Web/Plugin/Search/VLAN.pm lib/App/Netdisco/Web/PortControl.pm lib/App/Netdisco/Web/Report.pm lib/App/Netdisco/Web/Search.pm +lib/App/Netdisco/Web/Static.pm lib/App/Netdisco/Web/TypeAhead.pm +lib/App/NetdiscoX/Web/Plugin/Observium.pm LICENCE Makefile.PL MANIFEST This list of files @@ -127,8 +148,24 @@ share/environments/development.yml share/public/500.html share/public/css/bootstrap.min.css share/public/css/font-awesome.min.css +share/public/css/jquery.qtip.min.css share/public/css/nd_print.css share/public/css/netdisco.css +share/public/css/smoothness/images/animated-overlay.gif +share/public/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png +share/public/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png +share/public/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png +share/public/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png +share/public/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png +share/public/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png +share/public/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png +share/public/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png +share/public/css/smoothness/images/ui-icons_222222_256x240.png +share/public/css/smoothness/images/ui-icons_2e83ff_256x240.png +share/public/css/smoothness/images/ui-icons_454545_256x240.png +share/public/css/smoothness/images/ui-icons_888888_256x240.png +share/public/css/smoothness/images/ui-icons_cd0a0a_256x240.png +share/public/css/smoothness/jquery-ui.custom.min.css share/public/css/toastr.css share/public/dispatch.cgi share/public/dispatch.fcgi @@ -151,9 +188,15 @@ share/public/javascripts/d3.min.js share/public/javascripts/jquery-deserialize.js share/public/javascripts/jquery-history.js share/public/javascripts/jquery-latest.min.js +share/public/javascripts/jquery-ui.custom.min.js +share/public/javascripts/jquery.qtip.min.js share/public/javascripts/netdisco.js share/public/javascripts/netdisco_portcontrol.js share/public/javascripts/toastr.js +share/views/admintask.tt +share/views/ajax/admintask/jobqueue.tt +share/views/ajax/admintask/pseudodevice.tt +share/views/ajax/admintask/topology.tt share/views/ajax/device/addresses.tt share/views/ajax/device/details.tt share/views/ajax/device/netmap.tt @@ -167,11 +210,15 @@ share/views/ajax/search/vlan.tt share/views/device.tt share/views/index.tt share/views/inventory.tt +share/views/js/admintask.js share/views/js/common.js share/views/js/device.js share/views/js/report.js share/views/js/search.js share/views/layouts/main.tt +share/views/plugin/observium/device_port_column.tt +share/views/plugin/observium/observium.css +share/views/plugin/observium/observium.js share/views/report.tt share/views/search.tt share/views/sidebar/device/ports.tt diff --git a/Netdisco/META.yml b/Netdisco/META.yml index 78d68a42..c75e0b37 100644 --- a/Netdisco/META.yml +++ b/Netdisco/META.yml @@ -19,43 +19,44 @@ no_index: - inc - share requires: - Algorithm::Cron: 0 - App::cpanminus: 0 - App::local::lib::helper: 0 + Algorithm::Cron: 0.07 + App::cpanminus: 1.6108 + App::local::lib::helper: 0.07 DBD::Pg: 0 - DBD::SQLite: 0 - DBIx::Class: 0 - DBIx::Class::Helper::Row::SubClass: 0 - Daemon::Control: 0 - Dancer: 1.3098 - Dancer::Plugin::DBIC: 0 - File::ShareDir: 0 - HTML::Entities: 0 - HTTP::Tiny: 0 + DBD::SQLite: 1.37 + DBIx::Class: 0.0821 + DBIx::Class::Helpers: 2.016006 + Daemon::Control: 0.001 + Dancer: 1.3112 + Dancer::Plugin::DBIC: 0.1802 + File::ShareDir: 1.03 + HTML::Parser: 3.7 + HTTP::Tiny: 0.029 JSON: 0 - List::MoreUtils: 0 - MCE: 1.405 - Moo: 0 - Net::DNS: 0 - Net::MAC: 0 - NetAddr::IP: 4.059 - Path::Class: 0 - Plack: 1.0006 - Plack::Middleware::Expires: 0 - Role::Tiny: 0 - SNMP::Info: 3.00 - SQL::Translator: 0 - Socket6: 0 - Starman: 0 - Template: 0 - YAML: 0 - namespace::clean: 0 + List::MoreUtils: 0.33 + MCE: 1.408 + MIME::Base64: 3.13 + Moo: 1.001 + Net::DNS: 0.72 + Net::MAC: 2.103622 + NetAddr::IP: 4.068 + Path::Class: 0.32 + Plack: 1.0023 + Plack::Middleware::Expires: 0.03 + Role::Tiny: 1.002005 + SNMP::Info: 3.01 + SQL::Translator: 0.11016 + Socket6: 0.23 + Starman: 0.3008 + Template: 2.24 + YAML: 0.84 + namespace::clean: 0.24 perl: 5.10.0 - version: 0.9901 + version: 0.9902 resources: MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users - bugtracker: http://sourceforge.net/tracker/?group_id=80033&atid=558508 + bugtracker: http://sourceforge.net/p/netdisco/bugs/ homepage: http://netdisco.org/ license: http://opensource.org/licenses/bsd-license.php - repository: git://netdisco.git.sourceforge.net/gitroot/netdisco/netdisco-ng -version: 2.007000_001 + repository: git://git.code.sf.net/p/netdisco/netdisco-ng +version: 2.007000_002 diff --git a/Netdisco/Makefile.PL b/Netdisco/Makefile.PL index 6cbd7267..8898d0ca 100644 --- a/Netdisco/Makefile.PL +++ b/Netdisco/Makefile.PL @@ -49,8 +49,8 @@ install_script 'bin/netdisco-web'; resources homepage => 'http://netdisco.org/', - bugtracker => 'http://sourceforge.net/tracker/?group_id=80033&atid=558508', - repository => 'git://netdisco.git.sourceforge.net/gitroot/netdisco/netdisco-ng', + bugtracker => 'http://sourceforge.net/p/netdisco/bugs/', + repository => 'git://git.code.sf.net/p/netdisco/netdisco-ng', MailingList => 'https://lists.sourceforge.net/lists/listinfo/netdisco-users'; WriteAll; diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm index 48c2b1e3..ac497afe 100644 --- a/Netdisco/lib/App/Netdisco.pm +++ b/Netdisco/lib/App/Netdisco.pm @@ -7,7 +7,7 @@ use 5.010_000; use File::ShareDir 'dist_dir'; use Path::Class; -our $VERSION = '2.007000_001'; +our $VERSION = '2.007000_002'; BEGIN { if (not length ($ENV{DANCER_APPDIR} || '')