[Opsview-checkins] [opsview] [5310] Include Enterprise module information in Modules menu

[Commit messages for Opsview's subversion repository]

Title: [opsview] [5310] Include Enterprise module information in Modules menu

Revision

5310

Author

tvoon

Date

2010-11-04 22:55:39 +0000 (Thu, 04 Nov 2010)

Log Message

Include Enterprise module information in Modules menu

Modified Paths

• trunk/CHANGES
• trunk/opsview-core/bin/db_opsview
• trunk/opsview-core/import/initial_opsview.sql
• trunk/opsview-core/installer/upgradedb_opsview.pl
• trunk/opsview-web/lib/Opsview/Web/Controller/SideNav.pm
• trunk/opsview-web/root/wrapper_nav_menus

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2010-11-04 19:46:22 UTC (rev 5309)
+++ trunk/CHANGES	2010-11-04 22:55:39 UTC (rev 5310)
@@ -44,6 +44,7 @@
     ODW now stores summary statistics of number of hosts/services/serviceresults/perfdata per hour
     ODW now automatically cleans up failed imports
     Added feature to RESTAPI for JSONP to return windowname method for cross-site REST
+    Add icon to Modules menu for enterprise modules
 
     FIXES:
     Fixed new creation of SNMP trap rule type service check redirecting to rules page on create/clone

Modified: trunk/opsview-core/bin/db_opsview
===================================================================
--- trunk/opsview-core/bin/db_opsview	2010-11-04 19:46:22 UTC (rev 5309)
+++ trunk/opsview-core/bin/db_opsview	2010-11-04 22:55:39 UTC (rev 5310)
@@ -1094,7 +1094,7 @@
 	INSERT INTO schema_version (major_release, version) VALUES ('3.5', '4');
 	INSERT INTO schema_version (major_release, version) VALUES ('3.6', '1');
 	INSERT INTO schema_version (major_release, version) VALUES ('3.7', '37');
-	INSERT INTO schema_version (major_release, version) VALUES ('3.9', '19');
+	INSERT INTO schema_version (major_release, version) VALUES ('3.9', '20');
 
 
 EOF

Modified: trunk/opsview-core/import/initial_opsview.sql
===================================================================
--- trunk/opsview-core/import/initial_opsview.sql	2010-11-04 19:46:22 UTC (rev 5309)
+++ trunk/opsview-core/import/initial_opsview.sql	2010-11-04 22:55:39 UTC (rev 5310)
@@ -787,6 +787,10 @@
 INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`) VALUES (1,'Nagvis','/nagvis','Nagios Visualisation','',1,1,'','com.opsera.opsview.modules.nagvis');
 INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`) VALUES (2,'MRTG','/status/network_traffic','Multi Router Traffic Grapher','',1,2,'','com.opsera.opsview.modules.mrtg');
 INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`) VALUES (3,'NMIS','/cgi-nmis/nmiscgi.pl','Network Management Information System','ADMINACCESS',1,3,'','com.opsera.opsview.modules.nmis');
+INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`) VALUES (4,'Reports','http://www.opsview.com/products/enterprise-modules/reports','Opsview Reports Module','ADMINACCESS',1,4,'','com.opsera.opsview.modules.reports');
+INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`) VALUES (5,'Service Desk Connector','http://www.opsview.com/products/enterprise-modules/service-desk-connector','Opsview Service Desk Connector','ADMINACCESS',1,5,'','com.opsera.opsview.modules.servicedesk');
+INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`) VALUES (6,'SMS Messaging','http://www.opsview.com/products/enterprise-modules/sms-messaging','Opsview SMS Messaging','ADMINACCESS',1,6,'','com.opsera.opsview.modules.smsmessaging');
+INSERT INTO `modules` (`id`, `name`, `url`, `description`, `access`, `enabled`, `priority`, `version`, `namespace`) VALUES (7,'RANCID','http://www.opsview.com/products/enterprise-modules/rancid','Opsview RANCID','ADMINACCESS',1,7,'','com.opsera.opsview.modules.rancid');
 /*!40000 ALTER TABLE `modules` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET time_zo...@old_time_zone */;

Modified: trunk/opsview-core/installer/upgradedb_opsview.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb_opsview.pl	2010-11-04 19:46:22 UTC (rev 5309)
+++ trunk/opsview-core/installer/upgradedb_opsview.pl	2010-11-04 22:55:39 UTC (rev 5310)
@@ -2870,6 +2870,23 @@
     $db->updated;
 }
 
+if ( $db->is_lower("3.9.20") ) {
+    $db->print("Adding Enterprise module links");
+    unless ( $dbh->selectrow_array("SELECT 1 FROM modules WHERE namespace='com.opsera.opsview.modules.reports'") ) {
+        $dbh->do("INSERT INTO modules SET name='Reports', namespace='com.opsera.opsview.modules.reports', description='Opsview Reports Module', url='', access='ADMINACCESS', enabled=1, priority=500");
+    }
+    unless ( $dbh->selectrow_array("SELECT 1 FROM modules WHERE namespace='com.opsera.opsview.modules.servicedesk'") ) {
+        $dbh->do("INSERT INTO modules SET name='Service Desk Connector', namespace='com.opsera.opsview.modules.servicedesk', description='Opsview Service Desk Connector', url='', access='ADMINACCESS', enabled=1, priority=501");
+    }
+    unless ( $dbh->selectrow_array("SELECT 1 FROM modules WHERE namespace='com.opsera.opsview.modules.smsmessaging'") ) {
+        $dbh->do("INSERT INTO modules SET name='SMS Messaging', namespace='com.opsera.opsview.modules.smsmessaging', description='Opsview SMS Messaging', url='', access='ADMINACCESS', enabled=1, priority=502");
+    }
+    unless ( $dbh->selectrow_array("SELECT 1 FROM modules WHERE namespace='com.opsera.opsview.modules.rancid'") ) {
+        $dbh->do("INSERT INTO modules SET name='RANCID', namespace='com.opsera.opsview.modules.rancid', description='Opsview RANCID', url='', access='ADMINACCESS', enabled=1, priority=503");
+    }
+    $db->updated;
+}
+
 if ( $postupdate->{regenerate_hostgroups_lft_rgt} ) {
     require Opsview;
     require Opsview::Hostgroup;

Modified: trunk/opsview-web/lib/Opsview/Web/Controller/SideNav.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/Controller/SideNav.pm	2010-11-04 19:46:22 UTC (rev 5309)
+++ trunk/opsview-web/lib/Opsview/Web/Controller/SideNav.pm	2010-11-04 22:55:39 UTC (rev 5310)
@@ -34,6 +34,9 @@
     while ( my $item = $rs->next ) {
         my $h = { url ="" $item->url, name => $item->name };
         $h->{access} = $item->access if $item->access;
+        if ( $item->url =~ m%http://www.opsview.com% ) {
+            $h->{module_external_link} = 1;
+        }
         push @entries, $h;
     }
     my $dynamic_modules = { name => "Modules", entries => \...@entries };

Modified: trunk/opsview-web/root/wrapper_nav_menus
===================================================================
--- trunk/opsview-web/root/wrapper_nav_menus	2010-11-04 19:46:22 UTC (rev 5309)
+++ trunk/opsview-web/root/wrapper_nav_menus	2010-11-04 22:55:39 UTC (rev 5310)
@@ -18,9 +18,11 @@
 </div>
 		
 <!-- Drop down options -->
-[% FOREACH menu IN menus %]
-[% NEXT IF menu.custom == "host_search_box" %]
-[% name = menu.name | lower; %]
+[% 
+FOREACH menu IN menus; 
+  NEXT IF menu.custom == "host_search_box";
+  name = menu.name | lower;
+-%]
 <div id="menu-[% name %]" class="anylinkcss">
 <ul>
 [%- 
@@ -36,7 +38,12 @@
     IF entry.name == menu.entries.last.name;
       extra_classes.push("last");
     END;
-    %]<li[% IF extra_classes.size; ' class="'; extra_classes.join(" "); '"'; END; %]><a [% item_target %] href="" entry.url | html %]">[% entry.name %]</a></li>[%
+    %]<li[% IF extra_classes.size; ' class="'; extra_classes.join(" "); '"'; END; %]><a [% item_target %] href="" entry.url | html %]">[%
+    IF entry.module_external_link;
+      %]<img src="" c.uri_for("/images/opsview-icon-6px.png").path | html %]" /> [%
+    END;
+    entry.name | html;
+    %]</a></li>[%
     extra_classes = [];
   END -%]
 </ul>

_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins