Skip to content

GitLab

Commit 0543b213 authored by Florian Schaal's avatar Florian Schaal
Browse files

add mysql-quota (http://www.howtoforge.com/forums/showthread.php?t=64975)

parent 18b51953
Hide whitespace changes
Inline Side-by-side
install/sql/ispconfig3.sql
View file @ 0543b213
......@@ -214,6 +214,7 @@ CREATE TABLE `client` (
`default_dbserver` int(11) NOT NULL DEFAULT '1',
`dns_servers` blob NOT NULL DEFAULT '',
`limit_database` int(11) NOT NULL DEFAULT '-1',
`limit_database_quota` int(11) NOT NULL default '-1',
`limit_cron` int(11) NOT NULL DEFAULT '0',
`limit_cron_type` enum('url','chrooted','full') NOT NULL DEFAULT 'url',
`limit_cron_frequency` int(11) NOT NULL DEFAULT '5',
......@@ -317,6 +318,7 @@ CREATE TABLE `client_template` (
`limit_dns_slave_zone` int(11) NOT NULL default '-1',
`limit_dns_record` int(11) NOT NULL default '-1',
`limit_database` int(11) NOT NULL default '-1',
`limit_database_quota` int(11) NOT NULL default '-1',
`limit_cron` int(11) NOT NULL default '0',
`limit_cron_type` enum('url','chrooted','full') NOT NULL default 'url',
`limit_cron_frequency` int(11) NOT NULL default '5',
......@@ -1757,6 +1759,7 @@ CREATE TABLE `web_database` (
`type` varchar(16) NOT NULL DEFAULT 'y',
`database_name` varchar(64) DEFAULT NULL,
`database_name_prefix` varchar(50) NOT NULL default '',
`database_quota` int(11) unsigned DEFAULT NULL,
`database_user_id` int(11) unsigned DEFAULT NULL,
`database_ro_user_id` int(11) unsigned DEFAULT NULL,
`database_charset` varchar(64) DEFAULT NULL,
......
install/tpl/server.ini.master
View file @ 0543b213
......@@ -101,6 +101,8 @@ php_ini_check_minutes=1
overquota_notify_admin=y
overquota_notify_client=y
overquota_notify_freq=7
overquota_db_notify_admin=y
overquota_db_notify_client=y
overquota_notify_onok=n
[dns]
......
interface/lib/classes/tools_monitor.inc.php
View file @ 0543b213
......@@ -124,32 +124,35 @@ class tools_monitor {
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'database_size' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$data = unserialize($record['data']);
/*
Format the data
*/
//* format the data
$html =
'<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
<table>
<thead>
<tr>
<table><thead><tr>
<td>'.$app->lng("monitor_database_name_txt").'</td>
<td>'.$app->lng("monitor_database_size_txt").'</td>
<td>'.$app->lng("monitor_database_client_txt").'</td>
<td>'.$app->lng("monitor_database_domain_txt").'</td>
</tr>';
foreach($data as $line) {
$html .= '<tr>';
if ($line['size'] > 0) $line['size'] = $app->functions->formatBytes($line['size']);
$t=$app->db->queryOneRecord("SELECT username FROM client WHERE sys_groupid = ".$line['client_id']);
$line['client_id']=$t['username'];
unset($t);
//* get the client
$line['client']=$app->db->queryOneRecord("SELECT client.username FROM web_database, sys_group, client WHERE web_database.sys_groupid = sys_group.groupid AND sys_group.client_id = client.client_id AND web_database.database_name='".$line['database_name']."'")['username'];
//* get the domain
$line['domain']=$app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id=(SELECT parent_domain_id FROM web_database WHERE database_name='".$line['database_name']."')")['domain'];
//* remove the sys_groupid from output
unset($line['sys_groupid']);
foreach ($line as $item) {
$html .= '<td>' . $item . '</td>';
}
$html .= '</tr></tmpl loop>';
}
$html .= '</tbody></table>';
$html .= '</div></div>';
$html .= '</tbody></table></div></div>';
} else {
$html = '<p>'.$app->lng("no_data_database_size_txt").'</p>';
}
......
interface/web/admin/form/server_config.tform.php
View file @ 0543b213
......@@ -688,6 +688,18 @@ $form["tabs"]['web'] = array(
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
'overquota_db_notify_admin' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
'overquota_db_notify_client' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
'overquota_notify_freq' => array(
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
......
interface/web/admin/lib/lang/en_server_config.lng
View file @ 0543b213
......@@ -197,4 +197,6 @@ $wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
$wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
$wb["overquota_db_notify_admin_txt"] = 'Send DB quota warnings to admin';
$wb["overquota_db_notify_client_txt"] = 'Send DB quota warnings to client';
?>
interface/web/admin/templates/server_config_web_edit.htm
View file @ 0543b213
......@@ -125,6 +125,18 @@
{tmpl_var name='overquota_notify_client'}
</div>
</div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='overquota_db_notify_admin_txt'}</p>
<div class="multiField">
{tmpl_var name='overquota_db_notify_admin'}
</div>
</div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='overquota_db_notify_client_txt'}</p>
<div class="multiField">
{tmpl_var name='overquota_db_notify_client'}
</div>
</div>
<div class="ctrlHolder">
<label for="overquota_notify_freq">{tmpl_var name='overquota_notify_freq_txt'}</label>
<input name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='overquota_notify_freq_note_txt'}
......
interface/web/client/form/client.tform.php
View file @ 0543b213
......@@ -1093,6 +1093,20 @@ $form["tabs"]['limits'] = array (
'rows' => '',
'cols' => ''
),
'limit_database_quota' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_database_quota_error_notint'),
),
'default' => '-1',
'value' => '',
'separator' => '',
'width' => '10',
'maxlength' => '10',
'rows' => '',
'cols' => ''
),
'limit_cron' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
......
interface/web/client/form/client_template.tform.php
View file @ 0543b213
......@@ -557,6 +557,20 @@ $form["tabs"]['limits'] = array (
'rows' => '',
'cols' => ''
),
'limit_database_quota' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_database_quota_error_notint'),
),
'default' => '-1',
'value' => '',
'separator' => '',
'width' => '10',
'maxlength' => '10',
'rows' => '',
'cols' => ''
),
'limit_cron' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
......
interface/web/client/lib/lang/en_client.lng
View file @ 0543b213
......@@ -172,4 +172,6 @@ $wb['added_by_txt'] = 'Added by';
$wb['added_date_txt'] = 'Added date';
$wb['parent_client_id_txt'] = 'Client of reseller';
$wb['none_txt'] = 'none';
$wb['limit_database_quota_txt'] = 'Database quota';
$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
?>
interface/web/client/lib/lang/en_client_template.lng
View file @ 0543b213
......@@ -89,5 +89,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
$wb['client_limits_txt'] = 'Client Limits'
?>
\ No newline at end of file
$wb['client_limits_txt'] = 'Client Limits';
$wb['limit_database_quota_txt'] = 'Database quota';
$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
?>
interface/web/client/templates/client_edit_limits.htm
View file @ 0543b213
......@@ -229,6 +229,10 @@
<label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
<input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
</div>
<div class="ctrlHolder">
<label for="limit_database_quota">{tmpl_var name='limit_database_quota_txt'}</label>
<input name="limit_database_quota" id="limit_database_quota" value="{tmpl_var name='limit_database_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
</div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
<div style="display:none;">
......
interface/web/client/templates/client_template_edit_limits.htm
View file @ 0543b213
......@@ -171,6 +171,10 @@
<label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
<input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
</div>
<div class="ctrlHolder">
<label for="limit_database_quota">{tmpl_var name='limit_database_quota_txt'}</label>
<input name="limit_database_quota" id="limit_database_quota" value="{tmpl_var name='limit_database_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
</div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
<div style="display:none;">
......@@ -247,4 +251,4 @@
</div>
</div>
</div>
\ No newline at end of file
</div>
interface/web/sites/database_edit.php
View file @ 0543b213
......@@ -166,7 +166,7 @@ class page_action extends tform_actions {
if($_SESSION["s"]["user"]["typ"] != 'admin') {
// Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT db_servers, limit_database FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
$client = $app->db->queryOneRecord("SELECT db_servers, limit_database, limit_database_quota FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.groupid = $client_group_id");
// When the record is updated
if($this->id > 0) {
......@@ -191,6 +191,20 @@ class page_action extends tform_actions {
}
}
// Check client quota
if ($client['limit_database_quota'] >= 0) {
$tmp = $app->db->queryOneRecord("SELECT sum(database_quota) as db_quota FROM web_database WHERE sys_groupid = $client_group_id");
$db_quota = $tmp['db_quota'];
$new_db_quota = $app->functions->intval($this->dataRecord["database_quota"]);
if(($db_quota + $new_db_quota > $client['limit_database_quota']) || ($new_db_quota < 0 && $client['limit_database_quota'] >= 0)) {
$max_free_quota = floor($client['limit_database_quota'] - $db_quota);
if($max_free_quota < 0) $max_free_quota = 0;
$app->tform->errorMessage .= $app->tform->lng("limit_database_quota_free_txt").": ".$max_free_quota." MB<br>";
$this->dataRecord['database_quota'] = $max_free_quota;
}
unset($tmp);
}
}
} else {
// check if client of database parent domain is client of db user!
......
interface/web/sites/form/database.tform.php
View file @ 0543b213
......@@ -79,7 +79,7 @@ $form["tabs"]['database'] = array (
'formtype' => 'SELECT',
'default' => '',
'datasource' => array ( 'type' => 'SQL',
'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL} ORDER BY web_domain.domain",
'keyfield'=> 'domain_id',
'valuefield'=> 'parent_domain'
),
......@@ -117,6 +117,20 @@ $form["tabs"]['database'] = array (
'width' => '30',
'maxlength' => '25'
),
'database_quota' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_database_quota_error_notint'),
),
'default' => '-1',
'value' => '',
'separator' => '',
'width' => '10',
'maxlength' => '10',
'rows' => '',
'cols' => ''
),
'database_user_id' => array (
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
......
interface/web/sites/lib/lang/en_database.lng
View file @ 0543b213
......@@ -43,4 +43,7 @@ $wb['globalsearch_noresults_text_txt'] = "No results.";
$wb['globalsearch_noresults_limit_txt'] = "0 results";
$wb['globalsearch_searchfield_watermark_txt'] = "Search";
$wb['globalsearch_suggestions_text_txt'] = "Suggestions";
$wb['limit_database_quota_txt'] = 'Database quota';
$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
$wb['limit_database_quota_free_txt']='Max. available DB quota ';
?>
interface/web/sites/templates/database_edit.htm
View file @ 0543b213
......@@ -62,6 +62,10 @@
<input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
</tmpl_if>
</div>
<div class="ctrlHolder">
<label for="database_quota">{tmpl_var name='limit_database_quota_txt'}</label>
<input name="database_quota" id="database_quota" value="{tmpl_var name='limit_database_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />&nbsp;MB
</div>
<div class="ctrlHolder">
<label for="database_user_id">{tmpl_var name='database_user_txt'}</label>
<select name="database_user_id" id="database_user_id" class="selectInput">
......@@ -149,4 +153,4 @@
searchFieldWatermark: '',
resultBoxPosition: 'e'
});
</script>
\ No newline at end of file
</script>
server/conf/mail/db_quota_notification_de.txt 0 → 100644
View file @ 0543b213
ME-Version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: {admin_mail}
Reply-To: {admin_mail}
Subject: Datenbank-Speicherhinweis
Ihre Datenbank {database_name} hat den verfuegbaren Speicherplatz (nahezu) ausgeschoepft.
Datenbank: {databbase_name}
Belegter Speicherplatz: {used}
Verfuegbarer Speicherplatz: {quota}
Belegter Speicherplatz in %: {ratio}
server/conf/mail/db_quota_notification_en.txt 0 → 100644
View file @ 0543b213
ME-Version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: {admin_mail}
Reply-To: {admin_mail}
Subject: Database quota notification
The database {database_name} is near or over quota.
Database: {databbase_name}
Used space: {used}
Quota: {quota}
Usage ratio: {ratio}
server/conf/mail/db_quota_ok_notification_de.txt 0 → 100644
View file @ 0543b213
ME-Version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: {admin_mail}
Reply-To: {admin_mail}
Subject: Datenbank-Speicherhinweis
Der belegte Speicherplatz Ihrer Datenbank {database_name} ist wieder ok.
Datenbank: {databbase_name}
Belegter Speicherplatz: {used}
Verfuegbarer Speicherplatz: {quota}
Belegter Speicherplatz in %: {ratio}
server/conf/mail/db_quota_ok_notification_en.txt 0 → 100644
View file @ 0543b213
MIME-Version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: {admin_mail}
Reply-To: {admin_mail}
Subject: Database quota ok
The database {database_name} is no longer near or over quota.
Database: {database_name}
Used space: {used}
Quota: {quota}
Usage ratio: {ratio}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment