Merged revisions 3960-4065 from stable branch.

tbrehm

2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473

 interface/web/monitor/lib/module.conf.php

@@ -115,11 +115,21 @@
                  'target'    => 'content',
                  'link'   => 'monitor/show_data.php?type=services',
                  'html_id' => 'services');
				  
$items[] = array( 'title'    => "Show Monit",
                  'target'    => 'content',
                  'link'   => 'monitor/show_monit.php',
                  'html_id' => 'monit');

$items[] = array( 'title'    => "Show OpenVz VE BeanCounter",
                  'target'    => 'content',
                  'link'   => 'monitor/show_data.php?type=openvz_beancounter',
                  'html_id' => 'openvz_beancounter');
				  
$items[] = array( 'title'    => "Show Munin",
                  'target'    => 'content',
                  'link'   => 'monitor/show_munin.php',
                  'html_id' => 'monit');

$module["nav"][] = array(   'title'   => 'Server State',
                            'open'    => 1,