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 | 180 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 132 insertions(+), 48 deletions(-)
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 23685bf..58d849b 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -1,76 +1,160 @@
<?php
+/*
+ Config of the Module
+ */
$module["name"] = "monitor";
$module["title"] = "Monitor";
$module["template"] = "module.tpl.htm";
-$module["startpage"] = "monitor/system.php?mod=index";
$module["tab_width"] = '';
+$module["startpage"] = "monitor/show_sys_state.php?state=system";
+
+unset($items);
+$items[] = array( 'title' => "Show Overview",
+ 'target' => 'content',
+ 'link' => 'monitor/show_sys_state.php?state=system');
+
+$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);
+
/*
- Logmonitoring module
+ 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
*/
-$items[] = array( 'title' => "Load",
- 'target' => 'content',
- 'link' => 'monitor/system.php?mod=load');
+$servers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
-$items[] = array( 'title' => "Harddisk",
- 'target' => 'content',
- 'link' => 'monitor/system.php?mod=disk');
+$dropDown = "<select id='server_id' onchange=\"loadContent('monitor/show_sys_state.php?state=server&server=' + document.getElementById('server_id').value);\">";
+foreach ($servers as $server)
+{
+ $dropDown .= "<option value='" . $server['server_id'] . "|" . $server['server_name'] . "'>" . $server['server_name'] . "</option>";
+}
+$dropDown .= "</select>";
-$items[] = array( 'title' => "Memory usage",
- 'target' => 'content',
- 'link' => 'monitor/system.php?mod=memusage');
+/*
+ Now add them as dropdown to the navigation
+ */
+unset($items);
+$items[] = array( 'title' => $dropDown,
+ 'target' => '', // no action!
+ 'link' => ''); // no action!
-$items[] = array( 'title' => "CPU",
- 'target' => 'content',
- 'link' => 'monitor/system.php?mod=cpu');
+$module["nav"][] = array( 'title' => 'Server to Monitor',
+ 'open' => 1,
+ 'items' => $items);
-$items[] = array( 'title' => "Services",
- 'target' => 'content',
- 'link' => 'monitor/system.php?mod=services');
+/*
+ The first Server at the list is the server first selected
+ */
+$_SESSION['monitor']['server_id'] = $servers[0]['server_id'];
+$_SESSION['monitor']['server_name'] = $servers[0]['server_name'];
-
-$module["nav"][] = array( 'title' => 'System',
- 'open' => 1,
- 'items' => $items);
-
-// aufr�umen
+/*
+ * 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);
+
/*
- Logmonitoring module
-*/
+ * Clear and set the Navigation-Items
+ */
+unset($items);
+$items[] = array( 'title' => "Show Overview",
+ 'target' => 'content',
+ 'link' => 'monitor/show_sys_state.php?state=server');
-$items[] = array( 'title' => "Mail log",
- 'target' => 'content',
- 'link' => 'monitor/logview.php?log=mail_log');
+$items[] = array( 'title' => "Show Update State",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=system_update');
-$items[] = array( 'title' => "Mail warn",
- 'target' => 'content',
- 'link' => 'monitor/logview.php?log=mail_warn');
+$items[] = array( 'title' => "Show RAID state",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=raid_state');
-$items[] = array( 'title' => "Mail err",
- 'target' => 'content',
- 'link' => 'monitor/logview.php?log=mail_err');
+$items[] = array( 'title' => "Show Server load",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=server_load');
-$items[] = array( 'title' => "Messages",
- 'target' => 'content',
- 'link' => 'monitor/logview.php?log=messages');
+$items[] = array( 'title' => "Show Disk usage",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=disk_usage');
-$items[] = array( 'title' => "Freshclam",
- 'target' => 'content',
- 'link' => 'monitor/logview.php?log=freshclam');
+$items[] = array( 'title' => "Show Memory usage",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=mem_usage');
-$items[] = array( 'title' => "Clamav",
- 'target' => 'content',
- 'link' => 'monitor/logview.php?log=clamav');
+$items[] = array( 'title' => "Show Services",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=services');
+
+$module["nav"][] = array( 'title' => 'Server State',
+ 'open' => 1,
+ 'items' => $items);
+
+/*
+ * 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',
+ 'link' => 'monitor/show_log.php?log=log_mail');
+
+$items[] = array( 'title' => "Show Mail warn-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_mail_warn');
+
+$items[] = array( 'title' => "Show Mail err-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_mail_err');
+
+$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',
+ 'link' => 'monitor/show_log.php?log=log_freshclam');
+
+$items[] = array( 'title' => "Show Clamav-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_clamav');
+
+$items[] = array( 'title' => "Show RKHunter-Log",
+ 'target' => 'content',
+ '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,
- 'items' => $items);
-
-// aufr�umen
-unset($items);
+ 'open' => 1,
+ 'items' => $items);
?>
\ No newline at end of file
--
Gitblit v1.9.1