From 7162553354e297f7c152144eed24aaecd28e7b43 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Mon, 24 Nov 2008 16:27:37 -0500
Subject: [PATCH] The monitor now monitors the mailq and (on debian/ubuntu) the update-status
---
interface/web/monitor/lib/module.conf.php | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 2a443e3..9320046 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -14,7 +14,7 @@
'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,8 +51,17 @@
$_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' => 'System-Information',
+ 'open' => 1,
+ 'items' => $items);
/*
* Clear and set the Navigation-Items
@@ -61,6 +70,14 @@
$items[] = array( 'title' => "Show Server State",
'target' => 'content',
'link' => 'monitor/show_sys_state.php?state=server');
+/*
+ * The next menu is only available at debian or Ubuntu
+ */
+if(file_exists('/etc/debian_version')){
+$items[] = array( 'title' => "Show Update State",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=system_update');
+}
$items[] = array( 'title' => "Show Server Load",
'target' => 'content',
@@ -78,27 +95,13 @@
'target' => 'content',
'link' => 'monitor/show_data.php?type=services');
+$items[] = array( 'title' => "Show Mailq",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=mailq');
$module["nav"][] = array( 'title' => 'Monitoring',
'open' => 1,
'items' => $items);
-
-/*
- * 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' => 'System-Information',
- 'open' => 1,
- 'items' => $items);
-
-/*
- * Logmonitoring module
- */
/*
* Clear and set the Navigation-Items
--
Gitblit v1.9.1