From aa370627b211a51dc46891cfa4b6e3d2ef3e52db Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 16 Jul 2013 10:45:17 -0400
Subject: [PATCH] - Fixed FS#2924 - the month will not set automatically in the autoresponder by click now Along with this fixed some display problems with the combo boxes introduced in 3.0.5. Some fields were not correctly displayed with the predefined values if value and text of the underlying option element differ.
---
interface/web/monitor/lib/module.conf.php | 215 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 142 insertions(+), 73 deletions(-)
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 259e349..5983687 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -4,35 +4,59 @@
Config of the Module
*/
$module["name"] = "monitor";
-$module["title"] = "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
*/
+unset($items);
$items[] = array( 'title' => $dropDown,
- 'target' => '', // no action!
- 'link' => ''); // no action!
+ 'target' => '', // no action!
+ 'link' => '', // no action!
+ 'html_id' => 'select_server');
$module["nav"][] = array( 'title' => 'Server to Monitor',
- 'open' => 1,
- 'items' => $items);
-
+ 'open' => 1,
+ 'items' => $items);
+
/*
The first Server at the list is the server first selected
*/
@@ -40,83 +64,128 @@
$_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
-*/
+ * Clear and set the Navigation-Items
+ */
+unset($items);
+$items[] = array( 'title' => "Show Overview",
+ 'target' => 'content',
+ 'link' => 'monitor/show_sys_state.php?state=server',
+ 'html_id' => 'server');
-$items[] = array( 'title' => "Mail log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail');
+$items[] = array( 'title' => "Show Update State",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=system_update',
+ 'html_id' => 'system_update');
-$items[] = array( 'title' => "Mail warn",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail_warn');
+$items[] = array( 'title' => "Show RAID state",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=raid_state',
+ 'html_id' => 'raid_state');
-$items[] = array( 'title' => "Mail err",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail_err');
+$items[] = array( 'title' => "Show Server load",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=server_load',
+ 'html_id' => 'serverload');
-$items[] = array( 'title' => "Messages",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_messages');
+$items[] = array( 'title' => "Show Disk usage",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=disk_usage',
+ 'html_id' => 'disk_usage');
-$items[] = array( 'title' => "Freshclam",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_freshclam');
+$items[] = array( 'title' => "Show Memory usage",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=mem_usage',
+ 'html_id' => 'mem_usage');
-$items[] = array( 'title' => "Clamav",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_clamav');
+$items[] = array( 'title' => "Show Services",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=services',
+ 'html_id' => 'services');
-$items[] = array( 'title' => "ISPConfig",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_ispconfig');
+$items[] = array( 'title' => "Show OpenVz VE BeanCounter",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=openvz_beancounter',
+ 'html_id' => 'openvz_beancounter');
+$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 IPTables",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=iptables',
+ 'html_id' => 'iptables');
$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