From 59433e2bbba89c7f5a58ab6043fc9ad6a6593e3f Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Thu, 14 Apr 2011 14:10:28 -0400
Subject: [PATCH] typo - lathama
---
server/mods-available/monitor_core_module.inc.php | 217 ++++++++++++++++++++++++++++-------------------------
1 files changed, 115 insertions(+), 102 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index a336786..70df7fd 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -35,7 +35,7 @@
var $class_name = 'monitor_core_module';
/* No actions at this time. maybe later... */
var $actions_available = array();
- /** The Tools*/
+ /** The Tools */
private $_tools = null;
/**
@@ -76,12 +76,13 @@
*/
// TODO: what monitoring is done should be a config-var
private function _doMonitor() {
+ global $app;
/*
* We need the tools in almost every method, so initialize them once...
*/
$app->load('monitor_tools');
$this->_tools = new monitor_tools();
-
+
/*
* Calls the single Monitoring steps
*/
@@ -120,7 +121,7 @@
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorHDQuota();
-
+
/*
* Insert the data into the database
*/
@@ -128,14 +129,14 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorServer() {
@@ -145,7 +146,7 @@
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorServer();
-
+
/*
* Insert the data into the database
*/
@@ -153,14 +154,14 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorOsVer() {
@@ -170,7 +171,7 @@
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorOsVer();
-
+
/*
* Insert the data into the database
*/
@@ -178,14 +179,14 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorIspcVer() {
@@ -195,7 +196,7 @@
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorIspcVer();
-
+
/*
* Insert the data into the database
*/
@@ -203,14 +204,14 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorDiskUsage() {
@@ -220,7 +221,7 @@
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorDiskUsage();
-
+
/*
* Insert the data into the database
*/
@@ -228,14 +229,14 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMemUsage() {
@@ -244,7 +245,7 @@
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorMemUsage();
-
+
/*
* Insert the data into the database
*/
@@ -252,14 +253,14 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorCpu() {
@@ -268,7 +269,7 @@
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorCpu();
-
+
/*
* Insert the data into the database
*/
@@ -276,24 +277,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorServices() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorServices();
-
+
/*
* Insert the data into the database
*/
@@ -301,24 +302,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorOpenVzHost() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorOpenVzHost();
-
+
/*
* Insert the data into the database
*/
@@ -326,24 +327,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorOpenVzUserBeancounter() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorOpenVzUserBeancounter();
-
+
/*
* Insert the data into the database
*/
@@ -351,21 +352,21 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorSystemUpdate() {
/*
* This monitoring is expensive, so do it only once an hour
*/
- $min = date('i');
+ $min = @date('i');
if ($min != 0)
return;
@@ -373,12 +374,12 @@
* OK - here we go...
*/
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorSystemUpdate();
-
+
/*
* Insert the data into the database
*/
@@ -386,24 +387,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMailQueue() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorMailQueue();
-
+
/*
* Insert the data into the database
*/
@@ -411,24 +412,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorRaid() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorRaid();
-
+
/*
* Insert the data into the database
*/
@@ -436,34 +437,34 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorRkHunter() {
/*
* This monitoring is expensive, so do it only once a day
*/
- $min = date('i');
- $hour = date('H');
+ $min = @date('i');
+ $hour = @date('H');
if (!($min == 0 && $hour == 23))
return;
/*
* OK . here we go...
*/
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorRkHunter();
-
+
/*
* Insert the data into the database
*/
@@ -471,24 +472,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorFail2ban() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorFail2ban();
-
+
/*
* Insert the data into the database
*/
@@ -496,24 +497,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorSysLog() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorSysLog();
-
+
/*
* Insert the data into the database
*/
@@ -521,24 +522,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMailLog() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorMailLog();
-
+
/*
* Insert the data into the database
*/
@@ -546,24 +547,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMailWarnLog() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorMailWarnLog();
-
+
/*
* Insert the data into the database
*/
@@ -571,24 +572,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMailErrLog() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorMailErrLog();
-
+
/*
* Insert the data into the database
*/
@@ -596,24 +597,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorMessagesLog() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorMessagesLog();
-
+
/*
* Insert the data into the database
*/
@@ -621,24 +622,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorISPCCronLog() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorISPCCronLog();
-
+
/*
* Insert the data into the database
*/
@@ -646,24 +647,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorFreshClamLog() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorFreshClamLog();
-
+
/*
* Insert the data into the database
*/
@@ -671,24 +672,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorClamAvLog() {
- global $app;
-
+ global $app;
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorClamAvLog();
-
+
/*
* Insert the data into the database
*/
@@ -696,24 +697,24 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
private function _monitorIspConfigLog() {
global $app;
-
+
/*
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorIspConfigLog();
-
+
/*
* Insert the data into the database
*/
@@ -721,30 +722,42 @@
'VALUES (' .
$res['server_id'] . ', ' .
"'" . $app->dbmaster->quote($res['type']) . "', " .
- time() . ', ' .
+ 'UNIX_TIMESTAMP(), ' .
"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
"'" . $res['state'] . "'" .
')';
$app->dbmaster->query($sql);
/* The new data is written, now we can delete the old one */
- $this->_delOldRecords($type, 4);
+ $this->_delOldRecords($res['type'], $res['server_id']);
}
- /*
- Deletes Records older than n.
+ /**
+ * Deletes Records older than 4 minutes.
+ * The monitor writes new data every 5 minutes or longer (4 hour, 1 day).
+ * So if i delete all Date older than 4 minutes i can be sure, that all old data
+ * are deleted...
*/
-
- private function _delOldRecords($type, $min, $hour=0, $days=0) {
+ private function _delOldRecords($type, $serverId) {
global $app;
$now = time();
- $old = $now - ($min * 60) - ($hour * 60 * 60) - ($days * 24 * 60 * 60);
+ $old = $now - (4 * 60); // 4 minutes
+ /*
+ * ATTENTION if i do NOT pay attention of the server id, i delete all data (of the type)
+ * of ALL servers. This means, if i have a multiserver-environment and a server has a
+ * time not synced with the others (for example, all server has 11:00 and ONE server has
+ * 10:45) then the actual data of this server (with the time-stamp 10:45) get lost
+ * even though it is the NEWEST data of this server. To avoid this i HAVE to include
+ * the server-id!
+ */
$sql = 'DELETE FROM monitor_data ' .
'WHERE ' .
- 'type =' . "'" . $app->dbmaster->quote($type) . "' " .
+ ' type =' . "'" . $app->dbmaster->quote($type) . "' " .
'AND ' .
- 'created < ' . $old;
+ ' created < ' . $old . ' ' .
+ 'AND ' .
+ ' server_id = ' . $serverId;
$app->dbmaster->query($sql);
}
--
Gitblit v1.9.1