From e8a29cf134f7df1a1e7637083f6d7adf64949b7c Mon Sep 17 00:00:00 2001
From: jmontoya <jmontoya@ispconfig3>
Date: Wed, 04 Aug 2010 12:57:28 -0400
Subject: [PATCH] Adding new functions to the Remoting class
---
server/mods-available/monitor_core_module.inc.php | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 115 insertions(+), 0 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index e46512b..29dea26 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -195,8 +195,10 @@
// TODO: what monitoring is done should be a config-var
function doMonitor() {
/* Calls the single Monitoring steps */
+ $this->monitorHDQuota();
$this->monitorServer();
$this->monitorOSVer();
+ $this->monitorIspCVer();
$this->monitorDiskUsage();
$this->monitorMemUsage();
$this->monitorCpu();
@@ -218,7 +220,84 @@
$this->monitorFail2ban();
$this->monitorSysLog();
}
+
+ function monitorHDQuota() {
+ global $app;
+ global $conf;
+
+ /* Initialize data array */
+ $data = array();
+ /* the id of the server as int */
+ $server_id = intval($conf["server_id"]);
+
+ /** The type of the data */
+ $type = 'harddisk_quota';
+
+ /** The state of the harddisk_quota. */
+ $state = 'ok';
+
+ /** Fetch the data for all users*/
+ $dfData = shell_exec("repquota -asu");
+
+ // split into array
+ $df = explode("\n", $dfData);
+
+ /*
+ * ignore the first 5 lines, process the rest
+ */
+ for($i=5; $i <= sizeof($df); $i++) {
+ if ($df[$i] != '') {
+ /*
+ * Make a array of the data
+ */
+ $s = preg_split ("/[\s]+/", $df[$i]);
+ $username = $s[0];
+ $data['user'][$username]['used'] = $s[2];
+ $data['user'][$username]['soft'] = $s[3];
+ $data['user'][$username]['hard'] = $s[4];
+ }
+ }
+
+ /** Fetch the data for all users*/
+ $dfData = shell_exec("repquota -asg");
+
+ // split into array
+ $df = explode("\n", $dfData);
+
+ /*
+ * ignore the first 5 lines, process the rest
+ */
+ for($i=5; $i <= sizeof($df); $i++) {
+ if ($df[$i] != '') {
+ /*
+ * Make a array of the data
+ */
+ $s = preg_split ("/[\s]+/", $df[$i]);
+ $groupname = $s[0];
+ $data['group'][$groupname]['used'] = $s[1];
+ $data['group'][$groupname]['soft'] = $s[2];
+ $data['group'][$groupname]['hard'] = $s[3];
+ }
+ }
+
+ /*
+ 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, 4);
+ }
+
function monitorServer() {
global $app;
global $conf;
@@ -313,6 +392,42 @@
}
+ function monitorIspcVer() {
+ global $app;
+ global $conf;
+
+ /* the id of the server as int */
+ $server_id = intval($conf["server_id"]);
+
+ /** The type of the data */
+ $type = 'ispc_info';
+
+ /*
+ Fetch the data into a array
+ */
+ $data['name'] = ISPC_APP_TITLE;
+ $data['version'] = ISPC_APP_VERSION;
+
+ /* the ISPC-Version has no state. It is, what it is */
+ $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, 4);
+ }
+
function monitorDiskUsage() {
global $app;
global $conf;
--
Gitblit v1.9.1