From a7796bec1be01b51f400e9a3a698535b12b636aa Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 13:44:27 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/monitor/show_data.php | 204 ++++++++++++++++++++++++++++----------------------
1 files changed, 115 insertions(+), 89 deletions(-)
diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php
index 1cd4baf..f6940cf 100644
--- a/interface/web/monitor/show_data.php
+++ b/interface/web/monitor/show_data.php
@@ -28,8 +28,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('monitor');
@@ -47,93 +47,119 @@
$output = '';
switch($dataType) {
- case 'server_load':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showServerLoad();
- $time = $app->tools_monitor->getDataTime('server_load');
- $title = $app->lng("Server Load").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'disk_usage':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showDiskUsage();
- $time = $app->tools_monitor->getDataTime('disk_usage');
- $title = $app->lng("Disk usage").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'mem_usage':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showMemUsage();
- $time = $app->tools_monitor->getDataTime('mem_usage');
- $title = $app->lng("Memory usage").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'cpu_info':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showCpuInfo();
- $time = $app->tools_monitor->getDataTime('cpu_info');
- $title = $app->lng("monitor_title_cpuinfo_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'services':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showServices();
- $time = $app->tools_monitor->getDataTime('services');
- $title = $app->lng("Status of services").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'openvz_beancounter':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showOpenVzBeanCounter();
- $time = $app->tools_monitor->getDataTime('openvz_beancounter');
- $title = $app->lng("monitor_title_beancounter_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'system_update':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showSystemUpdate();
- $time = $app->tools_monitor->getDataTime('system_update');
- $title = $app->lng("monitor_title_updatestate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'mailq':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showMailq();
- $time = $app->tools_monitor->getDataTime('mailq');
- $title = $app->lng("monitor_title_mailq_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'raid_state':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showRaidState();
- $time = $app->tools_monitor->getDataTime('raid_state');
- $title = $app->lng("monitor_title_raidstate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'rkhunter':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showRKHunter();
- $time = $app->tools_monitor->getDataTime('rkhunter');
- $title = $app->lng("monitor_title_rkhunterlog_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'fail2ban':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showFail2ban();
- $time = $app->tools_monitor->getDataTime('log_fail2ban');
- $title = $app->lng("monitor_title_fail2ban_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'iptables':
- $template = 'templates/show_data.htm';
- $output .= $app->tools_monitor->showIPTables();
- $time = $app->tools_monitor->getDataTime('iptables_rules');
- $title = $app->lng("monitor_title_iptables_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- default:
- $template = '';
- break;
+case 'server_load':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showServerLoad();
+ $time = $app->tools_monitor->getDataTime('server_load');
+ $title = $app->lng("Server Load").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ $add_padding = true;
+ break;
+case 'disk_usage':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showDiskUsage();
+ $time = $app->tools_monitor->getDataTime('disk_usage');
+ $title = $app->lng("Disk usage").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'database_size':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showDatabaseSize();
+ $time = $app->tools_monitor->getDataTime('database_size');
+ $title = $app->lng("Database size").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'mem_usage':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showMemUsage();
+ $time = $app->tools_monitor->getDataTime('mem_usage');
+ $title = $app->lng("Memory usage").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'cpu_info':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showCpuInfo();
+ $time = $app->tools_monitor->getDataTime('cpu_info');
+ $title = $app->lng("monitor_title_cpuinfo_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'services':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showServices();
+ $time = $app->tools_monitor->getDataTime('services');
+ $title = $app->lng("Status of services").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'openvz_beancounter':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showOpenVzBeanCounter();
+ $time = $app->tools_monitor->getDataTime('openvz_beancounter');
+ $title = $app->lng("monitor_title_beancounter_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ $add_padding = true;
+ break;
+case 'system_update':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showSystemUpdate();
+ $time = $app->tools_monitor->getDataTime('system_update');
+ $title = $app->lng("monitor_title_updatestate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ $add_padding = true;
+ break;
+case 'mailq':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showMailq();
+ $time = $app->tools_monitor->getDataTime('mailq');
+ $title = $app->lng("monitor_title_mailq_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ $add_padding = true;
+ break;
+case 'raid_state':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showRaidState();
+ $time = $app->tools_monitor->getDataTime('raid_state');
+ $title = $app->lng("monitor_title_raidstate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ $add_padding = true;
+ break;
+case 'rkhunter':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showRKHunter();
+ $time = $app->tools_monitor->getDataTime('rkhunter');
+ $title = $app->lng("monitor_title_rkhunterlog_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ $add_padding = true;
+ break;
+case 'fail2ban':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showFail2ban();
+ $time = $app->tools_monitor->getDataTime('log_fail2ban');
+ $title = $app->lng("monitor_title_fail2ban_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ $add_padding = true;
+ break;
+case 'mongodb':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showMongoDB();
+ $time = $app->tools_monitor->getDataTime('log_mongodb');
+ $title = $app->lng("monitor_title_mongodb_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'iptables':
+ $template = 'templates/show_data.htm';
+ $output .= $app->tools_monitor->showIPTables();
+ $time = $app->tools_monitor->getDataTime('iptables_rules');
+ $title = $app->lng("monitor_title_iptables_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ $add_padding = true;
+ break;
+default:
+ $template = '';
+ break;
+}
+
+if($add_padding == true) {
+$output = '<div style="padding:20px;">'.$output.'</div>';
}
--
Gitblit v1.9.1