From b17cc67ee9cf6f83c2360da16fb53231203ada8a Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 23 May 2012 12:41:54 -0400
Subject: [PATCH] - Added group (we call groups "circles" so that users don't mix them up with user groups) feature to client messaging section so that messages can be sent to either all clients/resellers or to groups of clients/resellers. TODO: add circle access control so that 1) a reseller can create circles that contain only his clients, not all clients, and 2) a reseller can send messages only to his own circles instead of all circles.
---
interface/web/monitor/lib/module.conf.php | 110 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 31 deletions(-)
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 9320046..5983687 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -4,15 +4,26 @@
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/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');
+ '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,
@@ -23,6 +34,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);\">";
@@ -38,7 +50,8 @@
unset($items);
$items[] = array( 'title' => $dropDown,
'target' => '', // no action!
- 'link' => ''); // no action!
+ 'link' => '', // no action!
+ 'html_id' => 'select_server');
$module["nav"][] = array( 'title' => 'Server to Monitor',
'open' => 1,
@@ -57,9 +70,10 @@
$items[] = array( 'title' => "Show CPU info",
'target' => 'content',
- 'link' => 'monitor/show_data.php?type=cpu_info');
+ 'link' => 'monitor/show_data.php?type=cpu_info',
+ 'html_id' => 'cpu_info');
-$module["nav"][] = array( 'title' => 'System-Information',
+$module["nav"][] = array( 'title' => 'Hardware-Information',
'open' => 1,
'items' => $items);
@@ -67,39 +81,47 @@
* 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');
-/*
- * The next menu is only available at debian or Ubuntu
- */
-if(file_exists('/etc/debian_version')){
+ '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');
-}
+ 'link' => 'monitor/show_data.php?type=system_update',
+ 'html_id' => 'system_update');
-$items[] = array( 'title' => "Show Server Load",
+$items[] = array( 'title' => "Show RAID state",
'target' => 'content',
- 'link' => 'monitor/show_data.php?type=server_load');
+ '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');
+ 'link' => 'monitor/show_data.php?type=disk_usage',
+ 'html_id' => 'disk_usage');
$items[] = array( 'title' => "Show Memory usage",
'target' => 'content',
- 'link' => 'monitor/show_data.php?type=mem_usage');
+ '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');
+ 'link' => 'monitor/show_data.php?type=services',
+ 'html_id' => 'services');
-$items[] = array( 'title' => "Show Mailq",
+$items[] = array( 'title' => "Show OpenVz VE BeanCounter",
'target' => 'content',
- 'link' => 'monitor/show_data.php?type=mailq');
+ 'link' => 'monitor/show_data.php?type=openvz_beancounter',
+ 'html_id' => 'openvz_beancounter');
-$module["nav"][] = array( 'title' => 'Monitoring',
+$module["nav"][] = array( 'title' => 'Server State',
'open' => 1,
'items' => $items);
@@ -108,34 +130,60 @@
*/
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');
+ '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');
+ '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');
+ 'link' => 'monitor/show_log.php?log=log_mail_err',
+ 'html_id' => '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');
+ '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');
+ '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');
+ 'link' => 'monitor/show_log.php?log=log_clamav',
+ 'html_id' => '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',
+ '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,
--
Gitblit v1.9.1