Property changes on: trunk
___________________________________________________________________
Modified: svn:externals
- opsview-base https://secure.opsview.com/svn/opsview-base/trunk
+ opsview-base https://secure.opsview.com/svn/opsview-base/branches/nagvis-iframe
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/US307-network-map:9691
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647
/branches/nagvis-iframe:9764-9776
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/US307-network-map:9691
Modified: trunk/opsview-core/bin/db_opsview
===================================================================
--- trunk/opsview-core/bin/db_opsview 2012-08-09 17:27:54 UTC (rev 9785)
+++ trunk/opsview-core/bin/db_opsview 2012-08-09 17:38:56 UTC (rev 9786)
@@ -1215,7 +1215,7 @@
INSERT INTO schema_version (major_release, version) VALUES ('3.9', '27');
INSERT INTO schema_version (major_release, version) VALUES ('3.11', '15');
INSERT INTO schema_version (major_release, version) VALUES ('3.13', '11');
- INSERT INTO schema_version (major_release, version) VALUES ('3.15', '10');
+ INSERT INTO schema_version (major_release, version) VALUES ('3.15', '11');
EOF
Modified: trunk/opsview-core/import/initial_opsview.sql
===================================================================
--- trunk/opsview-core/import/initial_opsview.sql 2012-08-09 17:27:54 UTC (rev 9785)
+++ trunk/opsview-core/import/initial_opsview.sql 2012-08-09 17:38:56 UTC (rev 9786)
@@ -355,7 +355,7 @@
LOCK TABLES `modules` WRITE;
/*!40000 ALTER TABLE `modules` DISABLE KEYS */;
-INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`, `installed`) VALUES (1,'Nagvis','/nagvis','Nagios Core Visualisation','',1,1,'','com.opsview.modules.nagvis',1);
+INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`, `installed`) VALUES (1,'Nagvis','/modules/nagvis','Nagios Core Visualisation','',1,1,'','com.opsview.modules.nagvis',1);
INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`, `installed`) VALUES (2,'MRTG','/status/network_traffic','Multi Router Traffic Grapher','',1,2,'','com.opsview.modules.mrtg',1);
INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`, `installed`) VALUES (3,'NMIS','/cgi-nmis/nmiscgi.pl','Network Management Information System','ADMINACCESS',0,3,'','com.opsview.modules.nmis',1);
INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`, `installed`) VALUES (4,'Reports','http://www.opsview.com/products/enterprise-modules/reports','Opsview Reports Module','REPORTUSER',1,4,'','com.opsview.modules.reports',0);
Modified: trunk/opsview-core/installer/upgradedb_opsview.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb_opsview.pl 2012-08-09 17:27:54 UTC (rev 9785)
+++ trunk/opsview-core/installer/upgradedb_opsview.pl 2012-08-09 17:38:56 UTC (rev 9786)
@@ -4593,6 +4593,14 @@
$db->updated;
}
+if ( $db->is_lower("3.15.11") ) {
+ $db->print( "Updating NagVis url" );
+ $dbh->do(
+ "UPDATE modules SET url='' where namespace='com.opsview.modules.nagvis'"
+ );
+ $db->updated;
+}
+
# PLACEHOLDER
# For future upgrade of Opsview Core where you cannot have an automatic Opsview reload
# We mark this upgrade lock file so that post installs do not generate an unactivated configuration
Modified: trunk/opsview-core/t/var/opsview.test.db
===================================================================
--- trunk/opsview-core/t/var/opsview.test.db 2012-08-09 17:27:54 UTC (rev 9785)
+++ trunk/opsview-core/t/var/opsview.test.db 2012-08-09 17:38:56 UTC (rev 9786)
@@ -1284,7 +1284,7 @@
LOCK TABLES `modules` WRITE;
/*!40000 ALTER TABLE `modules` DISABLE KEYS */;
-INSERT INTO `modules` VALUES (1,'Nagvis','/nagvis','Nagios Visualisation','',1,1,'','com.opsview.modules.nagvis',1);
+INSERT INTO `modules` VALUES (1,'Nagvis','/modules/nagvis','Nagios Visualisation','',1,1,'','com.opsview.modules.nagvis',1);
INSERT INTO `modules` VALUES (2,'MRTG','/status/network_traffic','Multi Router Traffic Grapher','',1,2,'','com.opsview.modules.mrtg',1);
INSERT INTO `modules` VALUES (3,'NMIS','/cgi-nmis/nmiscgi.pl','Network Management Information System','ADMINACCESS',1,3,'','com.opsview.modules.nmis',1);
INSERT INTO `modules` VALUES (4,'Reports','http://www.opsview.com/products/enterprise-modules/reports','Opsview Reports Module','REPORTUSER',1,500,'','com.opsview.modules.reports',0);
Copied: trunk/opsview-web/lib/Opsview/Web/Controller/Nagvis.pm (from rev 9776, branches/nagvis-iframe/opsview-web/lib/Opsview/Web/Controller/Nagvis.pm)
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/Nagvis.pm (rev 0)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/Nagvis.pm 2012-08-09 17:38:56 UTC (rev 9786)
@@ -0,0 +1,44 @@
+#
+# AUTHORS:
+# Copyright (C) 2003-2012 Opsview Limited. All rights reserved
+#
+# This file is part of Opsview
+#
+# Opsview is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Opsview is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Opsview; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+package Opsview::Web::Controller::Nagvis;
+
+use strict;
+use warnings;
+
+use base qw/Catalyst::Controller/;
+
+sub index : Path('/modules/nagvis') {
+ my ( $self, $c, @args ) = @_;
+
+ $c->stash( extra_main_content_style => "padding: 0;" );
+ $c->stash( hide_footer => 1 );
+ $c->stash( hide_nav_toolbar => 1 );
+ $c->stash( template => "nagvis/index.tt" );
+}
+
+sub not_configured : Path('/nagvis/nagvis/index.php') {
+ my ( $self, $c, @args ) = @_;
+
+ $c->stash( template => "nagvis/not_configured.tt" );
+ $c->stash( wrapper => "wrappers/blank" );
+}
+
+1;
Deleted: trunk/opsview-web/root/nagvis
===================================================================
--- trunk/opsview-web/root/nagvis 2012-08-09 17:27:54 UTC (rev 9785)
+++ trunk/opsview-web/root/nagvis 2012-08-09 17:38:56 UTC (rev 9786)
@@ -1 +0,0 @@
-Nagvis is not configured. Please see <a href="" c.config.help_url %]nagvis">Opsview documentation</a> for details.
Modified: trunk/opsview-web/root/wrappers/default
===================================================================
--- trunk/opsview-web/root/wrappers/default 2012-08-09 17:27:54 UTC (rev 9785)
+++ trunk/opsview-web/root/wrappers/default 2012-08-09 17:38:56 UTC (rev 9786)
@@ -96,18 +96,23 @@
-%]
<div id="wrapper_top_push_down"[% noheader %]></div>
+[% UNLESS hide_nav_toolbar %]
<div id="wrapper_page_nav"[% noheader %]>
[% INCLUDE "wrapper_page_nav" %]
</div>
[% INCLUDE "toolbar_container" %]
-<div id="main_content">
+
+[% END; # UNLESS hide_nav_toolbar %]
+<div id="main_content"[% ' style="'_ extra_main_content_style _'"' IF extra_main_content_style %]>
[% content %]
</div>
+[% UNLESS hide_footer %]
<div id="wrapper_footer">
[% INCLUDE "wrapper_footer" %]
</div>
+[% END; # UNLESS hide_footer %]
</body>
[% IF include_footer; INCLUDE footer_ie6; END %]
</html>
Modified: trunk/opsview-web/t/721navigation.t
===================================================================
--- trunk/opsview-web/t/721navigation.t 2012-08-09 17:27:54 UTC (rev 9785)
+++ trunk/opsview-web/t/721navigation.t 2012-08-09 17:38:56 UTC (rev 9786)
@@ -95,7 +95,7 @@
[ 'Notifications' => '/cgi-bin/notifications.cgi' ],
[ 'Alert Summary' => '/cgi-bin/summary.cgi' ],
[ 'Alert Histogram' => '/cgi-bin/avail.cgi' ],
- [ 'Nagvis' => '/nagvis' ],
+ [ 'Nagvis' => '/modules/nagvis' ],
[ 'MRTG' => '/status/network_traffic' ],
[ 'NMIS' => '/cgi-nmis/nmiscgi.pl' ],
[ 'Hosts' => '/admin/host/list' ],
@@ -176,7 +176,7 @@
[ 'Notifications' => '/cgi-bin/notifications.cgi' ],
[ 'Alert Summary' => '/cgi-bin/summary.cgi' ],
[ 'Alert Histogram' => '/cgi-bin/avail.cgi' ],
- [ 'Nagvis' => '/nagvis' ],
+ [ 'Nagvis' => '/modules/nagvis' ],
[ 'MRTG' => '/status/network_traffic' ],
[ 'Hosts' => '/admin/host/list' ],
[ 'Host Templates' => '/admin/hosttemplate/list' ],
@@ -248,7 +248,7 @@
[ 'Notifications' => '/cgi-bin/notifications.cgi' ],
[ 'Alert Summary' => '/cgi-bin/summary.cgi' ],
[ 'Alert Histogram' => '/cgi-bin/avail.cgi' ],
- [ 'Nagvis' => '/nagvis' ],
+ [ 'Nagvis' => '/modules/nagvis' ],
[ 'MRTG' => '/status/network_traffic' ],
[ 'Hosts' => '/admin/host/list' ],
[ 'Your System' => '/about' ],
@@ -305,7 +305,7 @@
[ 'Notifications' => '/cgi-bin/notifications.cgi' ],
[ 'Alert Summary' => '/cgi-bin/summary.cgi' ],
[ 'Alert Histogram' => '/cgi-bin/avail.cgi' ],
- [ 'Nagvis' => '/nagvis' ],
+ [ 'Nagvis' => '/modules/nagvis' ],
[ 'MRTG' => '/status/network_traffic' ],
[ 'Your System' => '/about' ],
[ 'Administrator' => re( '^http://docs\.opsview\.com/doku\.php\?hosthash=[A-F0-9]{32}&uuid=TestDB&id=opsview-core$' ) ],
@@ -361,7 +361,7 @@
[ 'Notifications' => '/cgi-bin/notifications.cgi' ],
[ 'Alert Summary' => '/cgi-bin/summary.cgi' ],
[ 'Alert Histogram' => '/cgi-bin/avail.cgi' ],
- [ 'Nagvis' => '/nagvis' ],
+ [ 'Nagvis' => '/modules/nagvis' ],
[ 'MRTG' => '/status/network_traffic' ],
[ 'Your System' => '/about' ],
[ 'Administrator' => re( '^http://docs\.opsview\.com/doku\.php\?hosthash=[A-F0-9]{32}&uuid=TestDB&id=opsview-core$' ) ],
@@ -421,7 +421,7 @@
[ 'Notifications' => '/cgi-bin/notifications.cgi' ],
[ 'Alert Summary' => '/cgi-bin/summary.cgi' ],
[ 'Alert Histogram' => '/cgi-bin/avail.cgi' ],
- [ 'Nagvis' => '/nagvis' ],
+ [ 'Nagvis' => '/modules/nagvis' ],
[ 'MRTG' => '/status/network_traffic' ],
[ 'NMIS' => '/cgi-nmis/nmiscgi.pl' ],
[ 'Host Templates' => '/admin/hosttemplate/list' ],
@@ -514,7 +514,7 @@
[ 'Notifications' => '/cgi-bin/notifications.cgi' ],
[ 'Alert Summary' => '/cgi-bin/summary.cgi' ],
[ 'Alert Histogram' => '/cgi-bin/avail.cgi' ],
- [ 'Nagvis' => '/nagvis' ],
+ [ 'Nagvis' => '/modules/nagvis' ],
[ 'MRTG' => '/status/network_traffic' ],
[ 'Your System' => '/about' ],
[ 'Administrator' => re( '^http://docs\.opsview\.com/doku\.php\?hosthash=[A-F0-9]{32}&uuid=TestDB&id=opsview-core$' ) ],
Modified: trunk/opsview-web/t/740sidenav.t
===================================================================
--- trunk/opsview-web/t/740sidenav.t 2012-08-09 17:27:54 UTC (rev 9785)
+++ trunk/opsview-web/t/740sidenav.t 2012-08-09 17:38:56 UTC (rev 9786)
@@ -30,7 +30,7 @@
entries => [
{
name => "Nagvis",
- url ="" "/nagvis"
+ url ="" "/modules/nagvis"
},
{
name => "MRTG",
