From 0e2978ef48e7877ee46aa4a9e52e86b8f76c9733 Mon Sep 17 00:00:00 2001
From: Dominik Müller <info@profi-webdesign.net>
Date: Sat, 18 Jan 2014 23:34:06 -0500
Subject: [PATCH] Mailbox quota can now be included into website quota (FS#3297) -------------------------------------------------------------- Feature can be activated over admin mailserver settings. when activated websites uid is used instead of standard vmail-uid. this only takes effect if web and mailserver are on the same server, otherwise it will be old behaviour. switching this setting when mailboxes exist doesn't matter. Mailboxfolder will be created with website uid for this. access of postfix and dovecot now works over mysql-table mail_user. virtual_uid_maps is changed from static to mysql-table. for dovecot<->postfix communication protocoll is changed vrom lda to lmtp. disablelmtp-column is added to mail_user-table. uid and gid can be overwritten by remoting. ONE OPEN ISSUE: since remoting has completly changed and mail_user_add function is missing at the moment, this function now was inclulded again. it is important to add the both new lines to the future function and then remove this new one.
---
interface/web/monitor/lib/module.conf.php | 263 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 176 insertions(+), 87 deletions(-)
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 259e349..dc51ae3 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -3,36 +3,60 @@
/*
Config of the Module
*/
-$module["name"] = "monitor";
-$module["title"] = "Monitor";
-$module["template"] = "module.tpl.htm";
+$module["name"] = "monitor";
+$module["title"] = "top_menu_monitor";
+$module["template"] = "module.tpl.htm";
$module["tab_width"] = '';
-$module["startpage"] = "monitor/system.php?type=overview";
+$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',
+ 'html_id' => 'system');
+
+$items[] = array( 'title' => "Show System-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/log_list.php',
+ 'html_id' => 'system_log');
+
+$items[] = array( 'title' => 'Show Jobqueue',
+ 'target' => 'content',
+ 'link' => 'monitor/datalog_list.php',
+ 'html_id' => 'jobqueue');
+
+$module["nav"][] = array( 'title' => 'System State (All Servers)',
+ 'open' => 1,
+ 'items' => $items);
+
/*
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_data.php?type=overview&server=' + document.getElementById('server_id').value);\">";
+$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 .= "<option value='" . $server['server_id'] . "|" . $server['server_name'] . "'>" . $server['server_name'] . "</option>";
}
$dropDown .= "</select>";
/*
Now add them as dropdown to the navigation
*/
-$items[] = array( 'title' => $dropDown,
- 'target' => '', // no action!
- 'link' => ''); // no action!
+unset($items);
+$items[] = array( 'title' => $dropDown,
+ 'target' => '', // no action!
+ 'link' => '', // no action!
+ 'html_id' => 'select_server');
-$module["nav"][] = array( 'title' => 'Server to Monitor',
- 'open' => 1,
- 'items' => $items);
-
+$module["nav"][] = array( 'title' => 'Server to Monitor',
+ 'open' => 1,
+ 'items' => $items);
+
/*
The first Server at the list is the server first selected
*/
@@ -40,83 +64,148 @@
$_SESSION['monitor']['server_name'] = $servers[0]['server_name'];
/*
- Logmonitoring module
-*/
-// aufr�umen
-unset($items);
-$items[] = array( 'title' => "Server Load",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=server_load');
-
-$items[] = array( 'title' => "Disk usage",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=disk_usage');
-
-$items[] = array( 'title' => "Memory usage",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=mem_usage');
-
-$items[] = array( 'title' => "Services",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=services');
-
-
-$module["nav"][] = array( 'title' => 'Monitoring',
- 'open' => 1,
- 'items' => $items);
-
-// aufr�umen
+ * Clear and set the Navigation-Items
+ */
unset($items);
-$items[] = array( 'title' => "CPU",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=cpu_info');
+$items[] = array( 'title' => "Show CPU info",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=cpu_info',
+ 'html_id' => 'cpu_info');
-$module["nav"][] = array( 'title' => 'System-Information',
- 'open' => 1,
- 'items' => $items);
-
-// aufr�umen
-unset($items);
-
+$module["nav"][] = array( 'title' => 'Hardware-Information',
+ 'open' => 1,
+ 'items' => $items);
/*
- Logmonitoring module
-*/
-
-$items[] = array( 'title' => "Mail log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail');
-
-$items[] = array( 'title' => "Mail warn",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail_warn');
-
-$items[] = array( 'title' => "Mail err",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail_err');
-
-$items[] = array( 'title' => "Messages",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_messages');
-
-$items[] = array( 'title' => "Freshclam",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_freshclam');
-
-$items[] = array( 'title' => "Clamav",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_clamav');
-
-$items[] = array( 'title' => "ISPConfig",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_ispconfig');
-
-
-$module["nav"][] = array( 'title' => 'Logfiles',
- 'open' => 1,
- 'items' => $items);
-
-// aufr�umen
+ * Clear and set the Navigation-Items
+ */
unset($items);
-?>
\ No newline at end of file
+$items[] = array( 'title' => "Show Overview",
+ 'target' => 'content',
+ 'link' => 'monitor/show_sys_state.php?state=server',
+ 'html_id' => 'server');
+
+$items[] = array( 'title' => "Show Update State",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=system_update',
+ 'html_id' => 'system_update');
+
+$items[] = array( 'title' => "Show RAID state",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=raid_state',
+ 'html_id' => 'raid_state');
+
+$items[] = array( 'title' => "Show Server load",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=server_load',
+ 'html_id' => 'serverload');
+
+$items[] = array( 'title' => "Show Disk usage",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=disk_usage',
+ 'html_id' => 'disk_usage');
+
+$items[] = array( 'title' => "Show MySQL Database size",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=database_size',
+ 'html_id' => 'database_usage');
+
+$items[] = array( 'title' => "Show Memory usage",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=mem_usage',
+ 'html_id' => 'mem_usage');
+
+$items[] = array( 'title' => "Show Services",
+ '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,
+ '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',
+ 'html_id' => 'mailq');
+
+$items[] = array( 'title' => "Show Mail-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_mail',
+ 'html_id' => 'log_mail');
+
+$items[] = array( 'title' => "Show Mail warn-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_mail_warn',
+ 'html_id' => 'log_mail_warn');
+
+$items[] = array( 'title' => "Show Mail err-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_mail_err',
+ 'html_id' => 'log_mail_err');
+
+$items[] = array( 'title' => "Show System-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_messages',
+ 'html_id' => 'log_messages');
+
+$items[] = array( 'title' => "Show ISPC Cron-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_ispc_cron',
+ 'html_id' => 'log_ispc_cron');
+
+$items[] = array( 'title' => "Show Freshclam-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_freshclam',
+ 'html_id' => 'log_freshclam');
+
+$items[] = array( 'title' => "Show Clamav-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_clamav',
+ 'html_id' => 'log_clamav');
+
+$items[] = array( 'title' => "Show RKHunter-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=rkhunter',
+ 'html_id' => 'rkhunter');
+
+$items[] = array( 'title' => "Show fail2ban-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=fail2ban',
+ 'html_id' => 'fai2ban');
+
+$items[] = array( 'title' => "Show MongoDB-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=mongodb',
+ 'html_id' => 'mongodb');
+
+$items[] = array( 'title' => "Show IPTables",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=iptables',
+ 'html_id' => 'iptables');
+
+$module["nav"][] = array( 'title' => 'Logfiles',
+ 'open' => 1,
+ 'items' => $items);
+?>
--
Gitblit v1.9.1