From 2d2fd172e1548dd24e1719accd0b856cff6a31a0 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Fri, 18 Oct 2013 12:20:13 -0400
Subject: [PATCH] - Added funtion to convert currency formatted numbers back to floating numbers. - Improved getSearchSQL() function so that users can use their native date format so search for dates in lists.
---
server/lib/classes/monitor_tools.inc.php | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index b5ca043..0b1caa6 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -117,7 +117,6 @@
$relname = "UNKNOWN";
}
$distver = $ver.$lts." ".$relname;
- swriteln("Operating System: ".$distver."\n");
} elseif(trim(file_get_contents('/etc/debian_version')) == '4.0') {
$distname = 'Debian';
$distver = '4.0';
@@ -133,10 +132,10 @@
$distver = 'Squeeze/Sid';
$distid = 'debian60';
$distbaseid = 'debian';
- } elseif (strstr(trim(file_get_contents('/etc/debian_version')), '7.0') || trim(file_get_contents('/etc/debian_version')) == 'wheezy/sid') {
+ } elseif (strstr(trim(file_get_contents('/etc/debian_version')), '7.0') || strstr(trim(file_get_contents('/etc/debian_version')), '7.1') || trim(file_get_contents('/etc/debian_version')) == 'wheezy/sid') {
$distname = 'Debian';
$distver = 'Wheezy/Sid';
- $distid = 'debian70';
+ $distid = 'debian60';
$distbaseid = 'debian';
} else {
$distname = 'Debian';
@@ -303,7 +302,7 @@
$state = 'ok';
//* Fetch the data for all users
- $dfData = shell_exec('repquota -au');
+ $dfData = shell_exec('repquota -au 2>/dev/null');
//* Split into array
$df = explode("\n", $dfData);
@@ -331,7 +330,7 @@
}
//** Fetch the data for all users
- $dfData = shell_exec('repquota -ag');
+ $dfData = shell_exec('repquota -ag 2>/dev/null');
//* split into array
$df = explode("\n", $dfData);
@@ -474,7 +473,7 @@
}
public function monitorDiskUsage() {
- global $conf;
+ global $app,$conf;
/* the id of the server as int */
$server_id = intval($conf['server_id']);
@@ -486,7 +485,10 @@
$state = 'ok';
/** Fetch the data of ALL devices into a array (needed for monitoring!) */
- $dfData = shell_exec('df -hT');
+ //$dfData = shell_exec('df -hT 2>/dev/null');
+ $app->uses('getconf');
+ $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
+ $dfData = shell_exec('df -hT|grep -v "'.$web_config['website_basedir'].'/" 2>/dev/null');
// split into array
$df = explode("\n", $dfData);
@@ -1059,7 +1061,7 @@
/* fetch the next line */
$line = $tmp[$i];
- if ((strpos($line, '[U_]') !== false) || (strpos($line, '[_U]') !== false)) {
+ if ((strpos($line, 'U_]') !== false) || (strpos($line, '[_U') !== false) || (strpos($line, 'U_U') !== false)) {
/* One Disk is not working.
* if the next line starts with "[>" or "[=" then
* recovery (resync) is in state and the state is
@@ -1149,6 +1151,7 @@
$data['output'] = shell_exec('tw_cli info c0');
$state = 'ok';
+ if(is_array($data['output'])) {
foreach ($data['output'] as $item) {
if (strpos($item, 'RAID') !== false) {
if (strpos($item, ' VERIFYING ') !== false) {
@@ -1191,6 +1194,7 @@
$this->_setState($state, 'critical');
}
}
+ }
}
}
@@ -1308,7 +1312,7 @@
system('which iptables', $retval); // Debian, Ubuntu, Fedora
if ($retval === 0) {
/* Get the data of the log */
- $data['output'] = '<h2>iptables -S (ipv4)</h2>'.shell_exec('iptables -S');
+ $data['output'] = '<h2>iptables -S (ipv4)</h2>'.shell_exec('iptables -S 2>/dev/null');
/*
* At this moment, there is no state (maybe later)
@@ -1324,7 +1328,7 @@
system('which ip6tables', $retval); // Debian, Ubuntu, Fedora
if ($retval === 0) {
/* Get the data of the log */
- $data['output'] .= '<br><h2>ip6tables -S (ipv6)</h2>'.shell_exec('ip6tables -S');
+ $data['output'] .= '<br><h2>ip6tables -S (ipv6)</h2>'.shell_exec('ip6tables -S 2>/dev/null');
/*
* At this moment, there is no state (maybe later)
--
Gitblit v1.9.1