From 6eaaa70ea8ee9cd1044dbd101d6573d2e134d0f2 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Mon, 01 Dec 2008 05:19:20 -0500
Subject: [PATCH] added auto-revision from svn to version

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

diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 2a443e3..f89b70c 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -10,11 +10,11 @@
 $module["startpage"] 	= "monitor/show_sys_state.php?state=system";
 
 unset($items);
-$items[] = array( 'title' 	=> "Show System State",
+$items[] = array( 'title' 	=> "Show Overview",
                   'target' 	=> 'content',
                   'link'	=> 'monitor/show_sys_state.php?state=system');
 
-$module["nav"][] = array(	'title'	=> 'System State',
+$module["nav"][] = array(	'title'	=> 'System State (All Servers)',
                             'open' 	=> 1,
                             'items'	=> $items);
 
@@ -51,18 +51,35 @@
 $_SESSION['monitor']['server_name'] = $servers[0]['server_name'];
 
 /*
- * Logmonitoring module
+ * Clear and set the Navigation-Items
  */
+unset($items);
+
+$items[] = array( 'title' 	=> "Show CPU info",
+        'target' 	=> 'content',
+        'link'	=> 'monitor/show_data.php?type=cpu_info');
+
+$module["nav"][] = array(	'title'	=> 'Hardware-Information',
+        'open' 	=> 1,
+        'items'	=> $items);
 
 /*
  * Clear and set the Navigation-Items
  */
 unset($items);
-$items[] = array( 'title' 	=> "Show Server State",
+$items[] = array( 'title' 	=> "Show Overview",
                   'target' 	=> 'content',
                   'link'	=> 'monitor/show_sys_state.php?state=server');
 
-$items[] = array( 'title' 	=> "Show Server Load",
+$items[] = array( 'title' 	=> "Show Update State",
+                  'target' 	=> 'content',
+                  'link'	=> 'monitor/show_data.php?type=system_update');
+
+$items[] = array( 'title' 	=> "Show RAID state",
+                  'target' 	=> 'content',
+                  'link'	=> 'monitor/show_data.php?type=raid_state');
+
+$items[] = array( 'title' 	=> "Show Server load",
                   'target' 	=> 'content',
                   'link'	=> 'monitor/show_data.php?type=server_load');
 
@@ -79,7 +96,7 @@
                   'link'	=> 'monitor/show_data.php?type=services');
 
 
-$module["nav"][] = array(	'title'	=> 'Monitoring',
+$module["nav"][] = array(	'title'	=> 'Server State',
                             'open' 	=> 1,
                             'items'	=> $items);
 
@@ -88,22 +105,9 @@
  */
 unset($items);
 
-$items[] = array( 'title' 	=> "Show CPU info",
-        'target' 	=> 'content',
-        'link'	=> 'monitor/show_data.php?type=cpu_info');
-
-$module["nav"][] = array(	'title'	=> 'System-Information',
-        'open' 	=> 1,
-        'items'	=> $items);
-
-/*
- *   Logmonitoring module
- */
-
-/*
- * Clear and set the Navigation-Items
- */
-unset($items);
+$items[] = array( 'title' 	=> "Show Mail-Queue",
+                  'target' 	=> 'content',
+                  'link'	=> 'monitor/show_data.php?type=mailq');
 
 $items[] = array( 'title' 	=> "Show Mail-Log",
                   'target' 	=> 'content',
@@ -117,7 +121,7 @@
                   'target' 	=> 'content',
                   'link'	=> 'monitor/show_log.php?log=log_mail_err');
 
-$items[] = array( 'title' 	=> "Show Messages-Log",
+$items[] = array( 'title' 	=> "Show System-Log",
                   'target' 	=> 'content',
                   'link'	=> 'monitor/show_log.php?log=log_messages');
 
@@ -133,6 +137,9 @@
                   'target' 	=> 'content',
                   'link'	=> 'monitor/show_log.php?log=log_ispconfig');
 
+//$items[] = array( 'title' 	=> "Show RKHunter-Log",
+//                  'target' 	=> 'content',
+//                  'link'	=> 'monitor/show_data.php?type=rkhunter');
 
 $module["nav"][] = array(	'title'	=> 'Logfiles',
                             'open' 	=> 1,

--
Gitblit v1.9.1