From 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 10:04:06 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 interface/web/monitor/lib/module.conf.php |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 5983687..e177413 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -106,6 +106,11 @@
                   'link'	=> 'monitor/show_data.php?type=disk_usage',
                   'html_id' => 'disk_usage');
 
+$items[] = array( 'title'       => "Show MySQL Database size",
+                  'target'      => 'content',
+                  'link'        => 'monitor/show_data.php?type=database_size',
+                  'html_id' => 'database_usage');
+
 $items[] = array( 'title' 	=> "Show Memory usage",
                   'target' 	=> 'content',
                   'link'	=> 'monitor/show_data.php?type=mem_usage',
@@ -115,11 +120,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,
@@ -188,4 +203,4 @@
 $module["nav"][] = array(	'title'	=> 'Logfiles',
                             'open' 	=> 1,
                             'items'	=> $items);
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1