From 615a0a96618fa99e7e452523145d6c0f238d4473 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 31 Jul 2013 09:33:43 -0400
Subject: [PATCH] Merged revisions 3960-4065 from stable branch.

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

diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 5983687..1d4e5e1 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/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,

--
Gitblit v1.9.1