From 66c3bc24f069a2854bdf1eeebb6dcb51f6ef0afb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 28 Oct 2009 14:30:28 -0400
Subject: [PATCH] Implemented: FS#757 - Add "custom" option to transports
---
server/mods-available/monitor_core_module.inc.php | 753 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 637 insertions(+), 116 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 452d0c5..044f079 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -1,7 +1,6 @@
<?php
-
/*
-Copyright (c) 2008, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
+Copyright (c) 2007-2008, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -27,6 +26,7 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
class monitor_core_module {
/* TODO: this should be a config - var instead of a "constant" */
var $interval = 5; // do the monitoring every 5 minutes
@@ -36,7 +36,16 @@
/* No actions at this time. maybe later... */
var $actions_available = array();
- /*
+ //* This function is called during ispconfig installation to determine
+ // if a symlink shall be created for this plugin.
+ function onInstall() {
+ global $conf;
+
+ return true;
+
+ }
+
+ /*
This function is called when the module is loaded
*/
function onLoad() {
@@ -104,9 +113,16 @@
$this->monitorMailWarnLog();
$this->monitorMailErrLog();
$this->monitorMessagesLog();
+ $this->monitorISPCCronLog();
$this->monitorFreshClamLog();
$this->monitorClamAvLog();
$this->monitorIspConfigLog();
+ $this->monitorSystemUpdate();
+ $this->monitorMailQueue();
+ $this->monitorRaid();
+ $this->monitorRkHunter();
+ $this->monitorFail2ban();
+ $this->monitorSysLog();
}
function monitorServer(){
@@ -119,9 +135,6 @@
/** The type of the data */
$type = 'server_load';
- /* Delete Data older than 1 day */
- $this->_delOldRecords($type, 0, 0, 1);
-
/*
Fetch the data into a array
*/
@@ -132,11 +145,11 @@
$data['uptime'] = shell_exec("uptime");
- $tmp = explode(",", $data['uptime'], 3);
- $tmpUser = explode(" ", trim($tmp[1]));
+ $tmp = explode(",", $data['uptime'], 4);
+ $tmpUser = explode(" ", trim($tmp[2]));
$data['user_online'] = intval($tmpUser[0]);
- $loadTmp = explode(":" , trim($tmp[2]));
+ $loadTmp = explode(":" , trim($tmp[3]));
$load = explode(",", $loadTmp[1]);
$data['load_1'] = floatval(trim($load[0]));
$data['load_5'] = floatval(trim($load[1]));
@@ -155,12 +168,15 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
}
function monitorDiskUsage() {
@@ -173,14 +189,11 @@
/** The type of the data */
$type = 'disk_usage';
- /* Delete Data older than 10 minutes */
- $this->_delOldRecords($type, 10);
-
/** The state of the disk-usage */
$state = 'ok';
- /** Fetch the data into a array */
- $dfData = shell_exec("df");
+ /** Fetch the data of ALL devices into a array (needed for monitoring!)*/
+ $dfData = shell_exec("df -hT");
// split into array
$df = explode("\n", $dfData);
@@ -196,19 +209,24 @@
*/
$s = preg_split ("/[\s]+/", $df[$i]);
$data[$i]['fs'] = $s[0];
- $data[$i]['size'] = $s[1];
- $data[$i]['used'] = $s[2];
- $data[$i]['available'] = $s[3];
- $data[$i]['percent'] = $s[4];
- $data[$i]['mounted'] = $s[5];
+ $data[$i]['type'] = $s[1];
+ $data[$i]['size'] = $s[2];
+ $data[$i]['used'] = $s[3];
+ $data[$i]['available'] = $s[4];
+ $data[$i]['percent'] = $s[5];
+ $data[$i]['mounted'] = $s[6];
/*
* calculate the state
*/
$usePercent = floatval($data[$i]['percent']);
- if ($usePercent > 75) $state = $this->_setState($state, 'info');
- if ($usePercent > 80) $state = $this->_setState($state, 'warning');
- if ($usePercent > 90) $state = $this->_setState($state, 'critical');
- if ($usePercent > 95) $state = $this->_setState($state, 'error');
+
+ //* We dont want to check the cdrom drive as a cd / dvd is always 100% full
+ if($data[$i]['type'] != 'iso9660' && $data[$i]['type'] != 'cramfs' && $data[$i]['type'] != 'udf') {
+ if ($usePercent > 75) $state = $this->_setState($state, 'info');
+ if ($usePercent > 80) $state = $this->_setState($state, 'warning');
+ if ($usePercent > 90) $state = $this->_setState($state, 'critical');
+ if ($usePercent > 95) $state = $this->_setState($state, 'error');
+ }
}
}
@@ -219,12 +237,15 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
}
@@ -239,9 +260,6 @@
/** The type of the data */
$type = 'mem_usage';
- /* Delete Data older than 10 minutes */
- $this->_delOldRecords($type, 10);
-
/*
Fetch the data into a array
*/
@@ -250,7 +268,7 @@
$memInfo = explode("\n", $miData);
foreach($memInfo as $line){
- $part = split(":", $line);
+ $part = preg_split("/:/", $line);
$key = trim($part[0]);
$tmp = explode(" ", trim($part[1]));
$value = 0;
@@ -270,12 +288,15 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
}
@@ -290,20 +311,20 @@
/** The type of the data */
$type = 'cpu_info';
- /* There is only ONE CPU-Data, so delete the old one */
- $this->_delOldRecords($type, 0);
-
/*
Fetch the data into a array
*/
$cpuData = shell_exec("cat /proc/cpuinfo");
$cpuInfo = explode("\n", $cpuData);
+ $processor = 0;
foreach($cpuInfo as $line){
- $part = split(":", $line);
+
+ $part = preg_split("/:/", $line);
$key = trim($part[0]);
$value = trim($part[1]);
- $data[$key] = $value;
+ if($key == 'processor') $processor = intval($value);
+ if($key != '') $data[$key.' '.$processor] = $value;
}
/* the cpu has no state. It is, what it is */
@@ -315,12 +336,15 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
}
@@ -333,13 +357,10 @@
$server_id = intval($conf["server_id"]);
/** get the "active" Services of the server from the DB */
- $services = $app->db->queryOneRecord("SELECT * FROM server WHERE server_id = " . $server_id);
+ $services = $app->dbmaster->queryOneRecord("SELECT * FROM server WHERE server_id = " . $server_id);
/* The type of the Monitor-data */
$type = 'services';
-
- /* There is only ONE Service-Data, so delete the old one */
- $this->_delOldRecords($type, 0);
/** the State of the monitoring */
/* ok, if ALL aktive services are running,
@@ -439,16 +460,399 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
}
- function monitorMailLog()
+
+ function monitorSystemUpdate(){
+ /*
+ * This monitoring is expensive, so do it only once a hour
+ */
+ $min = date('i');
+ if ($min != 0) return;
+
+ /*
+ * OK - here we go...
+ */
+ global $app;
+ global $conf;
+
+ /* the id of the server as int */
+ $server_id = intval($conf["server_id"]);
+
+ /** The type of the data */
+ $type = 'system_update';
+
+ /* This monitoring is only available at debian or Ubuntu */
+ if(file_exists('/etc/debian_version')){
+
+ /*
+ * first update the "update-database"
+ */
+ shell_exec('apt-get update');
+
+ /*
+ * Then test the upgrade.
+ * if there is any output, then there is a needed update
+ */
+ $aptData = shell_exec('apt-get -s -qq dist-upgrade');
+ if ($aptData == '')
+ {
+ /* There is nothing to update! */
+ $state = 'ok';
+ }
+ else
+ {
+ /* There is something to update! */
+ $state = 'warning';
+ }
+
+ /*
+ * Fetch the output
+ */
+ $data['output'] = shell_exec('apt-get -s -q dist-upgrade');
+ }
+ else {
+ /*
+ * It is not debian/Ubuntu, so there is no data and no state
+ *
+ * no_state, NOT unknown, because "unknown" is shown as state
+ * inside the GUI. no_state is hidden.
+ *
+ * We have to write NO DATA inside the DB, because the GUI
+ * could not know, if there is any dat, or not...
+ */
+ $state = 'no_state';
+ $data['output']= '';
+ }
+
+ /*
+ * Insert the data into the database
+ */
+ $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
+ "VALUES (".
+ $server_id . ", " .
+ "'" . $app->dbmaster->quote($type) . "', " .
+ time() . ", " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
+ "'" . $state . "'" .
+ ")";
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 0, 2);
+ }
+
+ function monitorMailQueue(){
+ global $app;
+ global $conf;
+
+ /* the id of the server as int */
+ $server_id = intval($conf["server_id"]);
+
+ /** The type of the data */
+ $type = 'mailq';
+
+ /* Get the data from the mailq */
+ $data['output'] = shell_exec('mailq');
+
+ /*
+ * The last line has more informations
+ */
+ $tmp = explode("\n", $data['output']);
+ $more = $tmp[sizeof($tmp) - 1];
+ $this->_getIntArray($more);
+ $data['bytes'] = $res[0];
+ $data['requests'] = $res[1];
+
+ /** The state of the mailq. */
+ $state = 'ok';
+ if ($data['requests'] > 2000 ) $state = 'info';
+ if ($data['requests'] > 5000 ) $state = 'warning';
+ if ($data['requests'] > 8000 ) $state = 'critical';
+ if ($data['requests'] > 10000 ) $state = 'error';
+
+ /*
+ * Insert the data into the database
+ */
+ $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
+ "VALUES (".
+ $server_id . ", " .
+ "'" . $app->dbmaster->quote($type) . "', " .
+ time() . ", " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
+ "'" . $state . "'" .
+ ")";
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
+ }
+
+
+ function monitorRaid(){
+ global $app;
+ global $conf;
+
+ /* the id of the server as int */
+ $server_id = intval($conf["server_id"]);
+
+ /** The type of the data */
+ $type = 'raid_state';
+
+ /* This monitoring is only available if mdadm is installed */
+ $location = system('which mdadm', $retval);
+ if($retval === 0){
+ /*
+ * Fetch the output
+ */
+ $data['output'] = shell_exec('cat /proc/mdstat');
+
+ /*
+ * Then calc the state.
+ */
+ $tmp = explode("\n", $data['output']);
+ $state = 'ok';
+ for ($i = 0; $i < sizeof($tmp); $i++){
+ /* fetch the next line */
+ $line = $tmp[$i];
+
+ if ((strpos($line, '[U_]') !== false) || (strpos($line, '[_U]') !== false))
+ {
+ /* One Disk is not working.
+ * if the next line starts with "[>" or "[=" then
+ * recovery (resync) is in state and the state is
+ * information instead of critical
+ */
+ $nextLine = $tmp[$i+1];
+ if ((strpos($nextLine, '[>') === false) && (strpos($nextLine, '[=') === false)) {
+ $state = $this->_setState($state, 'critical');
+ }
+ else
+ {
+ $state = $this->_setState($state, 'info');
+ }
+ }
+ if (strpos($line, '[__]') !== false)
+ {
+ /* both Disk are not working */
+ $state = $this->_setState($state, 'error');
+ }
+ if (strpos($line, '[UU]') !== false)
+ {
+ /* The disks are OK.
+ * if the next line starts with "[>" or "[=" then
+ * recovery (resync) is in state and the state is
+ * information instead of ok
+ */
+ $nextLine = $tmp[$i+1];
+ if ((strpos($nextLine, '[>') === false) && (strpos($nextLine, '[=') === false)) {
+ $state = $this->_setState($state, 'ok');
+ }
+ else
+ {
+ $state = $this->_setState($state, 'info');
+ }
+ }
+ }
+
+ }
+ else {
+ /*
+ * mdadm is not installed, so there is no data and no state
+ *
+ * no_state, NOT unknown, because "unknown" is shown as state
+ * inside the GUI. no_state is hidden.
+ *
+ * We have to write NO DATA inside the DB, because the GUI
+ * could not know, if there is any dat, or not...
+ */
+ $state = 'no_state';
+ $data['output']= '';
+ }
+
+ /*
+ * Insert the data into the database
+ */
+ $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
+ "VALUES (".
+ $server_id . ", " .
+ "'" . $app->dbmaster->quote($type) . "', " .
+ time() . ", " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
+ "'" . $state . "'" .
+ ")";
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
+ }
+
+ function monitorRkHunter(){
+ /*
+ * This monitoring is expensive, so do it only once a day
+ */
+ $min = date('i');
+ $hour = date('H');
+ if (!($min == 0 && $hour == 23)) return;
+
+ global $app;
+ global $conf;
+
+ /* the id of the server as int */
+ $server_id = intval($conf["server_id"]);
+
+ /** The type of the data */
+ $type = 'rkhunter';
+
+ /* This monitoring is only available if rkhunter is installed */
+ $location = system('which rkhunter', $retval);
+ if($retval === 0){
+ /*
+ * Fetch the output
+ */
+ $data['output'] = shell_exec('rkhunter --update --checkall --nocolors --skip-keypress');
+
+ /*
+ * At this moment, there is no state (maybe later)
+ */
+ $state = 'no_state';
+ }
+ else {
+ /*
+ * rkhunter is not installed, so there is no data and no state
+ *
+ * no_state, NOT unknown, because "unknown" is shown as state
+ * inside the GUI. no_state is hidden.
+ *
+ * We have to write NO DATA inside the DB, because the GUI
+ * could not know, if there is any dat, or not...
+ */
+ $state = 'no_state';
+ $data['output']= '';
+ }
+
+ /*
+ * Insert the data into the database
+ */
+ $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
+ "VALUES (".
+ $server_id . ", " .
+ "'" . $app->dbmaster->quote($type) . "', " .
+ time() . ", " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
+ "'" . $state . "'" .
+ ")";
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 0, 2);
+ }
+
+ function monitorFail2ban(){
+ global $app;
+ global $conf;
+
+ /* the id of the server as int */
+ $server_id = intval($conf["server_id"]);
+
+ /** The type of the data */
+ $type = 'log_fail2ban';
+
+ /* This monitoring is only available if fail2ban is installed */
+ $location = system('which fail2ban-client', $retval); // Debian, Ubuntu, Fedora
+ if($retval !== 0) $location = system('which fail2ban', $retval); // CentOS
+ if($retval === 0){
+ /* Get the data of the log */
+ $data = $this->_getLogData($type);
+
+ /*
+ * At this moment, there is no state (maybe later)
+ */
+ $state = 'no_state';
+ }
+ else {
+ /*
+ * fail2ban is not installed, so there is no data and no state
+ *
+ * no_state, NOT unknown, because "unknown" is shown as state
+ * inside the GUI. no_state is hidden.
+ *
+ * We have to write NO DATA inside the DB, because the GUI
+ * could not know, if there is any dat, or not...
+ */
+ $state = 'no_state';
+ $data = '';
+ }
+
+ /*
+ * Insert the data into the database
+ */
+ $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
+ "VALUES (".
+ $server_id . ", " .
+ "'" . $app->dbmaster->quote($type) . "', " .
+ time() . ", " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
+ "'" . $state . "'" .
+ ")";
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
+ }
+
+ function monitorSysLog(){
+ global $app;
+ global $conf;
+
+ /* the id of the server as int */
+ $server_id = intval($conf["server_id"]);
+
+ /** The type of the data */
+ $type = 'sys_log';
+
+ /*
+ * is there any warning or error for this server?
+ */
+ $state = 'ok';
+ $dbData = $app->dbmaster->queryAllRecords("SELECT loglevel FROM sys_log WHERE server_id = " . $server_id . " AND loglevel > 0");
+ if (is_array($dbData)) {
+ foreach($dbData as $item){
+ if ($item['loglevel'] == 1) $state = $this->_setState($state, 'warning');
+ if ($item['loglevel'] == 2) $state = $this->_setState($state, 'error');
+ }
+ }
+
+ /** There is no monitor-data because the data is in the sys_log table */
+ $data['output']= '';
+
+ /*
+ * Insert the data into the database
+ */
+ $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
+ "VALUES (".
+ $server_id . ", " .
+ "'" . $app->dbmaster->quote($type) . "', " .
+ time() . ", " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
+ "'" . $state . "'" .
+ ")";
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
+ }
+
+ function monitorMailLog()
{
global $app;
global $conf;
@@ -458,9 +862,6 @@
/** The type of the data */
$type = 'log_mail';
-
- /* There is only ONE Log-Data, so delete the old one */
- $this->_delOldRecords($type, 0);
/* Get the data of the log */
$data = $this->_getLogData($type);
@@ -477,12 +878,15 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
}
function monitorMailWarnLog()
@@ -496,10 +900,6 @@
/** The type of the data */
$type = 'log_mail_warn';
- /* There is only ONE Log-Data, so delete the old one */
- $this->_delOldRecords($type, 0);
-
-
/* Get the data of the log */
$data = $this->_getLogData($type);
@@ -515,12 +915,15 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
}
function monitorMailErrLog()
@@ -534,10 +937,6 @@
/** The type of the data */
$type = 'log_mail_err';
- /* There is only ONE Log-Data, so delete the old one */
- $this->_delOldRecords($type, 0);
-
-
/* Get the data of the log */
$data = $this->_getLogData($type);
@@ -553,12 +952,15 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
}
@@ -573,8 +975,42 @@
/** The type of the data */
$type = 'log_messages';
- /* There is only ONE Log-Data, so delete the old one */
- $this->_delOldRecords($type, 0);
+ /* Get the data of the log */
+ $data = $this->_getLogData($type);
+
+ /*
+ * actually this info has no state.
+ * maybe someone knows better...???...
+ */
+ $state = 'no_state';
+
+ /*
+ Insert the data into the database
+ */
+ $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
+ "VALUES (".
+ $server_id . ", " .
+ "'" . $app->dbmaster->quote($type) . "', " .
+ time() . ", " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
+ "'" . $state . "'" .
+ ")";
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
+ }
+
+ function monitorISPCCronLog()
+ {
+ global $app;
+ global $conf;
+
+ /* the id of the server as int */
+ $server_id = intval($conf["server_id"]);
+
+ /** The type of the data */
+ $type = 'log_ispc_cron';
/* Get the data of the log */
$data = $this->_getLogData($type);
@@ -591,14 +1027,17 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
- }
+ $app->dbmaster->query($sql);
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
+ }
+
function monitorFreshClamLog()
{
global $app;
@@ -610,15 +1049,49 @@
/** The type of the data */
$type = 'log_freshclam';
- /* There is only ONE Log-Data, so delete the old one */
- $this->_delOldRecords($type, 0);
-
-
/* Get the data of the log */
$data = $this->_getLogData($type);
- // Todo: the state should be calculated.
+ /* Get the data from the LAST log-Entry.
+ * if there can be found:
+ * WARNING: Your ClamAV installation is OUTDATED!
+ * then the clamav is outdated. This is a warning!
+ */
$state = 'ok';
+
+ $tmp = explode("\n", $data);
+ $lastLog = array();
+ if ($tmp[sizeof($tmp)-1] == "")
+ {
+ /* the log ends with an empty line remove this */
+ array_pop($tmp);
+ }
+ if (strpos($tmp[sizeof($tmp)-1], "-------------") !== false)
+ {
+ /* the log ends with "-----..." remove this */
+ array_pop($tmp);
+ }
+ for ($i = sizeof($tmp) -1; $i > 0; $i--){
+ if (strpos($tmp[$i], "---------") === false){
+ /* no delimiter found, so add this to the last-log */
+ $lastLog[] = $tmp[$i];
+ }
+ else
+ {
+ /* delimiter found, so there is no more line left! */
+ break;
+ }
+ }
+
+ /*
+ * Now we have the last log in the array.
+ * Check if the outdated-string is found...
+ */
+ foreach($lastLog as $line){
+ if (strpos(strtolower($line), "outdated") !== false) {
+ $state = $this->_setState($state, 'warning');
+ }
+ }
/*
Insert the data into the database
@@ -626,12 +1099,15 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
}
function monitorClamAvLog()
@@ -645,9 +1121,6 @@
/** The type of the data */
$type = 'log_clamav';
- /* There is only ONE Log-Data, so delete the old one */
- $this->_delOldRecords($type, 0);
-
/* Get the data of the log */
$data = $this->_getLogData($type);
@@ -660,12 +1133,15 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
}
function monitorIspConfigLog()
@@ -679,10 +1155,6 @@
/** The type of the data */
$type = 'log_ispconfig';
- /* There is only ONE Log-Data, so delete the old one */
- $this->_delOldRecords($type, 0);
-
-
/* Get the data of the log */
$data = $this->_getLogData($type);
@@ -695,37 +1167,72 @@
$sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
"VALUES (".
$server_id . ", " .
- "'" . $app->db->quote($type) . "', " .
+ "'" . $app->dbmaster->quote($type) . "', " .
time() . ", " .
- "'" . $app->db->quote(serialize($data)) . "', " .
+ "'" . $app->dbmaster->quote(serialize($data)) . "', " .
"'" . $state . "'" .
")";
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
+
+ /* The new data is written, now we can delete the old one */
+ $this->_delOldRecords($type, 10);
}
function _getLogData($log){
- switch($log) {
+
+ $dist = '';
+ $logfile = '';
+
+ if(@is_file('/etc/debian_version')) $dist = 'debian';
+ if(@is_file('/etc/redhat-release')) $dist = 'redhat';
+ if(@is_file('/etc/SuSE-release')) $dist = 'suse';
+
+ switch($log) {
case 'log_mail':
- $logfile = '/var/log/mail.log';
+ if($dist == 'debian') $logfile = '/var/log/mail.log';
+ if($dist == 'redhat') $logfile = '/var/log/maillog';
+ if($dist == 'suse') $logfile = '/var/log/mail.info';
break;
case 'log_mail_warn':
- $logfile = '/var/log/mail.warn';
+ if($dist == 'debian') $logfile = '/var/log/mail.warn';
+ if($dist == 'redhat') $logfile = '/var/log/maillog';
+ if($dist == 'suse') $logfile = '/var/log/mail.warn';
break;
case 'log_mail_err':
- $logfile = '/var/log/mail.err';
+ if($dist == 'debian') $logfile = '/var/log/mail.err';
+ if($dist == 'redhat') $logfile = '/var/log/maillog';
+ if($dist == 'suse') $logfile = '/var/log/mail.err';
break;
case 'log_messages':
- $logfile = '/var/log/messages';
+ if($dist == 'debian') $logfile = '/var/log/messages';
+ if($dist == 'redhat') $logfile = '/var/log/messages';
+ if($dist == 'suse') $logfile = '/var/log/messages';
+ break;
+ case 'log_ispc_cron':
+ if($dist == 'debian') $logfile = '/var/log/ispconfig/cron.log';
+ if($dist == 'redhat') $logfile = '/var/log/ispconfig/cron.log';
+ if($dist == 'suse') $logfile = '/var/log/ispconfig/cron.log';
break;
case 'log_freshclam':
- $logfile = '/var/log/clamav/freshclam.log';
- break;
+ if($dist == 'debian') $logfile = '/var/log/clamav/freshclam.log';
+ if($dist == 'redhat') $logfile = (is_file('/var/log/clamav/freshclam.log') ? '/var/log/clamav/freshclam.log' : '/var/log/freshclam.log');
+ if($dist == 'suse') $logfile = '';
+ break;
case 'log_clamav':
- $logfile = '/var/log/clamav/clamav.log';
+ if($dist == 'debian') $logfile = '/var/log/clamav/clamav.log';
+ if($dist == 'redhat') $logfile = (is_file('/var/log/clamav/clamd.log') ? '/var/log/clamav/clamd.log' : '/var/log/maillog');
+ if($dist == 'suse') $logfile = '';
+ break;
+ case 'log_fail2ban':
+ if($dist == 'debian') $logfile = '/var/log/fail2ban.log';
+ if($dist == 'redhat') $logfile = '/var/log/fail2ban.log';
+ if($dist == 'suse') $logfile = '/var/log/fail2ban.log';
break;
case 'log_ispconfig':
- $logfile = '/var/log/ispconfig/ispconfig.log';
+ if($dist == 'debian') $logfile = '/var/log/ispconfig/ispconfig.log';
+ if($dist == 'redhat') $logfile = '/var/log/ispconfig/ispconfig.log';
+ if($dist == 'suse') $logfile = '/var/log/ispconfig/ispconfig.log';
break;
default:
$logfile = '';
@@ -735,7 +1242,7 @@
// Getting the logfile content
if($logfile != '') {
$logfile = escapeshellcmd($logfile);
- if(stristr($logfile, ';')) {
+ if(stristr($logfile, ';') or substr($logfile,0,9) != '/var/log/' or stristr($logfile, '..')) {
$log = 'Logfile path error.';
}
else
@@ -761,7 +1268,7 @@
function _checkTcp ($host,$port) {
- $fp = @fsockopen ($host, $port, &$errno, &$errstr, 2);
+ $fp = @fsockopen ($host, $port, $errno, $errstr, 2);
if ($fp) {
fclose($fp);
@@ -773,7 +1280,7 @@
function _checkUdp ($host,$port) {
- $fp = @fsockopen ('udp://'.$host, $port, &$errno, &$errstr, 2);
+ $fp = @fsockopen ('udp://'.$host, $port, $errno, $errstr, 2);
if ($fp) {
fclose($fp);
@@ -805,10 +1312,10 @@
$old = $now - ($min * 60) - ($hour * 60 * 60) - ($days * 24 * 60 * 60);
$sql = "DELETE FROM monitor_data " .
"WHERE " .
- "type =" . "'" . $app->db->quote($type) . "' " .
+ "type =" . "'" . $app->dbmaster->quote($type) . "' " .
"AND " .
"created < " . $old;
- $app->db->query($sql);
+ $app->dbmaster->query($sql);
}
/*
@@ -846,9 +1353,9 @@
switch ($newState) {
case 'no_state': $newInt = 0 ;
break;
- case 'unknown': $newInt = 1 ;
+ case 'ok': $newInt = 1 ;
break;
- case 'ok': $newInt = 2 ;
+ case 'unknown': $newInt = 2 ;
break;
case 'info': $newInt = 3 ;
break;
@@ -872,7 +1379,21 @@
}
}
+ function _getIntArray($line){
+ /** The array of float found */
+ $res = array();
+ /* First build a array from the line */
+ $data = explode(' ', $line);
+ /* then check if any item is a float */
+ foreach ($data as $item) {
+ if ($item . '' == (int)$item . ''){
+ $res[] = $item;
+ }
+ }
+ return $res;
+ }
+
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1