From 66c3bc24f069a2854bdf1eeebb6dcb51f6ef0afb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 28 Oct 2009 14:30:28 -0400
Subject: [PATCH] Implemented: FS#757 - Add "custom" option to transports
---
interface/web/monitor/lib/module.conf.php | 70 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 2a443e3..58d849b 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -10,11 +10,19 @@
$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',
+$items[] = array( 'title' => "Show System-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/log_list.php');
+
+$items[] = array( 'title' => 'Show Jobqueue',
+ 'target' => 'content',
+ 'link' => 'monitor/datalog_list.php');
+
+$module["nav"][] = array( 'title' => 'System State (All Servers)',
'open' => 1,
'items' => $items);
@@ -23,6 +31,7 @@
We need all the available servers on the left navigation.
So fetch them from the database and add then to the navigation as dropdown-list
*/
+
$servers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
$dropDown = "<select id='server_id' onchange=\"loadContent('monitor/show_sys_state.php?state=server&server=' + document.getElementById('server_id').value);\">";
@@ -51,18 +60,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 +105,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 +114,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,9 +130,13 @@
'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');
+
+$items[] = array( 'title' => "Show ISPC Cron-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_ispc_cron');
$items[] = array( 'title' => "Show Freshclam-Log",
'target' => 'content',
@@ -129,10 +146,13 @@
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_clamav');
-$items[] = array( 'title' => "Show ISPConfig-Log",
+$items[] = array( 'title' => "Show RKHunter-Log",
'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_ispconfig');
+ 'link' => 'monitor/show_data.php?type=rkhunter');
+$items[] = array( 'title' => "Show fail2ban-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=fail2ban');
$module["nav"][] = array( 'title' => 'Logfiles',
'open' => 1,
--
Gitblit v1.9.1