diff --git a/cloudAPI/cloudManager.py b/cloudAPI/cloudManager.py
index a62696ac1..fbb5a4d52 100755
--- a/cloudAPI/cloudManager.py
+++ b/cloudAPI/cloudManager.py
@@ -1070,11 +1070,11 @@ class CloudManager:
def fetchRam(self, request):
try:
- request.session['userID'] = self.admin.pk
- currentACL = ACLManager.loadedACL(self.admin.pk)
-
- if currentACL['admin'] == 0:
- return self.ajaxPre(0, 'Only administrators can see MySQL status.')
+ # request.session['userID'] = self.admin.pk
+ # currentACL = ACLManager.loadedACL(self.admin.pk)
+ #
+ # if currentACL['admin'] == 0:
+ # return self.ajaxPre(0, 'Only administrators can see MySQL status.')
# if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
# return self.ajaxPre(0, 'This feature is currently only available on CentOS.')
diff --git a/databases/databaseManager.py b/databases/databaseManager.py
index 1cc17cf2f..6811966cf 100755
--- a/databases/databaseManager.py
+++ b/databases/databaseManager.py
@@ -84,6 +84,27 @@ class DatabaseManager:
proc = httpProc(request, template, {'websitesList': websitesName}, 'deleteDatabase')
return proc.render()
+ def MySQLManager(self, request = None, userID = None):
+ template = 'databases/mysqlmanager.html'
+ proc = httpProc(request, template, None)
+ return proc.render()
+ def OptimizeMySQL(self, request = None, userID = None):
+ from cloudAPI.cloudManager import CloudManager
+ cm = CloudManager()
+ result = cm.fetchRam(request)
+
+ data1 = json.loads(result.content)
+
+
+
+ data = {}
+ data['ramInGB'] = data1.get('ramInGB')
+ data['conf'] = data1.get('conf')
+
+ template = 'databases/OptimizeMySQL.html'
+ proc = httpProc(request, template, data)
+ return proc.render()
+
def fetchDatabases(self, userID = None, data = None):
try:
@@ -308,6 +329,8 @@ class DatabaseManager:
except BaseException as msg:
print("0," + str(msg))
+
+
def main():
parser = argparse.ArgumentParser(description='CyberPanel Installer')
diff --git a/databases/mysqlOptimizer.py b/databases/mysqlOptimizer.py
new file mode 100644
index 000000000..0af62b253
--- /dev/null
+++ b/databases/mysqlOptimizer.py
@@ -0,0 +1,121 @@
+
+import math
+import random
+from textwrap import dedent
+
+
+
+class MySQLOptimizer:
+ defaults = {
+ 'mysql_dir': "/var/lib/mysql",
+
+ 'log_error': "/var/lib/mysql/mysqld.log",
+ 'slow_query_log_file': "/var/lib/mysql/mysqld-slow.log",
+
+ 'pid_file': "/var/lib/mysql/mysqld.pid",
+
+ 'mysql_ram_gb': 1,
+
+ 'query_cache_type': 0,
+ 'query_cache_size': 0,
+
+ 'long_query_time': 2,
+ 'max_connections': 500,
+
+ 'server_id': random.randint(100000, 999999)
+ }
+
+
+ @staticmethod
+ def mycnf_innodb_log_file_size_MB(innodb_buffer_pool_size_GB):
+ if innodb_buffer_pool_size_GB > 64:
+ return '768M'
+ if innodb_buffer_pool_size_GB > 24:
+ return '512M'
+ if innodb_buffer_pool_size_GB > 8:
+ return '256M'
+ if innodb_buffer_pool_size_GB > 2:
+ return '128M'
+
+ return '64M'
+
+ @staticmethod
+ def output_memory_gb(gb):
+
+ if math.fabs(math.ceil(gb) - gb) < 0.01:
+ return str(int(gb)) + 'G'
+
+ return str(int(gb * 1024)) + 'M'
+
+ @staticmethod
+ def mycnf_make(m):
+ m['innodb_buffer_pool_size'] = MySQLOptimizer.output_memory_gb(float(m['mysql_ram_gb']) * 0.15)
+ m['innodb_log_file_size'] = MySQLOptimizer.mycnf_innodb_log_file_size_MB(m['mysql_ram_gb'])
+ return m
+
+ @staticmethod
+ def output_my_cnf(_metaconf):
+ return dedent("""
+[mysqld]
+
+# GENERAL #
+user = mysql
+default-storage-engine = InnoDB
+#socket = {mysql_dir}/mysql.sock
+#pid-file = {pid_file}
+
+# MyISAM #
+# key-buffer-size = 32M
+# myisam-recover = FORCE,BACKUP
+
+# SAFETY #
+max-allowed-packet = 16M
+max-connect-errors = 1000000
+sql-mode = NO_ENGINE_SUBSTITUTION,NO_AUTO_CREATE_USER
+sysdate-is-now = 1
+innodb-strict-mode = 1
+
+# DATA STORAGE #
+datadir = {mysql_dir}
+
+# SERVER ID #
+server-id = {server_id}
+
+# CACHES AND LIMITS #
+max-connections = {max_connections}
+tmp-table-size = 32M
+max-heap-table-size = 32M
+query-cache-type = {query_cache_type}
+query-cache-size = {query_cache_size}
+thread-cache-size = 50
+open-files-limit = 65535
+table-definition-cache = 1024
+table-open-cache = 2048
+
+# INNODB #
+innodb-flush-method = O_DIRECT
+innodb-log-files-in-group = 2
+innodb-log-file-size = {innodb_log_file_size}
+innodb-flush-log-at-trx-commit = 1
+innodb-file-per-table = 1
+innodb-buffer-pool-size = {innodb_buffer_pool_size}
+
+# LOGGING #
+log-error = {log_error}
+slow-query-log = 1
+slow-query-log-file = {slow_query_log_file}
+log-queries-not-using-indexes = OFF
+long_query_time = 30
+
+[mysqldump]
+max-allowed-packet = 16M
+
+!includedir /etc/mysql/conf.d/
+!includedir /etc/mysql/mariadb.conf.d/
+
+""".format(**MySQLOptimizer.mycnf_make(_metaconf)))
+
+ @staticmethod
+ def generateRecommendations(detectedRam):
+ MySQLOptimizer.defaults['mysql_ram_gb'] = int(float(detectedRam))
+ return MySQLOptimizer.output_my_cnf(MySQLOptimizer.defaults)
\ No newline at end of file
diff --git a/databases/static/databases/databases.js b/databases/static/databases/databases.js
index 7b10cf48a..57cf96187 100755
--- a/databases/static/databases/databases.js
+++ b/databases/static/databases/databases.js
@@ -603,3 +603,211 @@ app.controller('phpMyAdmin', function ($scope, $http, $window) {
}
});
+
+
+app.controller('Mysqlmanager', function ($scope, $http, $compile, $window) {
+ $scope.cyberPanelLoading = true;
+ $scope.mysql_status = 'test'
+
+
+ $scope.getstatus = function () {
+
+ $scope.cyberPanelLoading = false;
+
+ url = "/dataBases/getMysqlstatus";
+
+ var data = {};
+
+ var config = {
+ headers: {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+
+ $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+ $scope.cyberPanelLoading = true;
+ if (response.data.status === 1) {
+ $scope.uptime = response.data.uptime;
+ $scope.connections = response.data.connections;
+ $scope.Slow_queries = response.data.Slow_queries;
+ $scope.processes = JSON.parse(response.data.processes);
+ $timeout($scope.showStatus, 3000);
+
+ new PNotify({
+ title: 'Success',
+ text: 'Successfully Fetched',
+ type: 'success'
+ });
+ } else {
+ new PNotify({
+ title: 'Error!',
+ text: response.data.error_message,
+ type: 'error'
+ });
+ }
+
+ }
+
+ function cantLoadInitialDatas(response) {
+ $scope.cyberPanelLoading = true;
+ new PNotify({
+ title: 'Error!',
+ text: "cannot load",
+ type: 'error'
+ });
+ }
+
+ }
+
+ $scope.getstatus();
+});
+
+
+app.controller('OptimizeMysql', function ($scope, $http) {
+ $scope.cyberPanelLoading = true;
+
+ $scope.generateRecommendations = function () {
+ $scope.cyberhosting = false;
+ url = "/dataBases/generateRecommendations";
+
+ var data = {
+ detectedRam: $("#detectedRam").text()
+ };
+
+ var config = {
+ headers: {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
+
+
+ function ListInitialData(response) {
+ $scope.cyberhosting = true;
+ if (response.data.status === 1) {
+ $scope.suggestedContent = response.data.generatedConf;
+
+ } else {
+ new PNotify({
+ title: 'Error!',
+ text: response.data.error_message,
+ type: 'error'
+ });
+ }
+
+ }
+
+ function cantLoadInitialData(response) {
+ $scope.cyberhosting = true;
+ new PNotify({
+ title: 'Error!',
+ text: 'Could not connect to server, please refresh this page.',
+ type: 'error'
+ });
+ }
+
+ };
+
+
+ $scope.applyMySQLChanges = function () {
+ $scope.cyberhosting = false;
+ url = "/dataBases/applyMySQLChanges";
+
+ var encodedContent = encodeURIComponent($scope.suggestedContent);
+
+ var data = {
+ suggestedContent: encodedContent
+ };
+
+ var config = {
+ headers: {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+ $http.post(url, data, config).then(ListInitialData, cantLoadInitialData);
+
+
+ function ListInitialData(response) {
+ $scope.cyberhosting = true;
+ if (response.data.status === 1) {
+
+ new PNotify({
+ title: 'Success',
+ text: 'Changes successfully applied.',
+ type: 'success'
+ });
+
+
+ } else {
+ new PNotify({
+ title: 'Error!',
+ text: response.data.error_message,
+ type: 'error'
+ });
+ }
+
+ }
+
+ function cantLoadInitialData(response) {
+ $scope.cyberhosting = true;
+ new PNotify({
+ title: 'Error!',
+ text: 'Could not connect to server, please refresh this page.',
+ type: 'error'
+ });
+ }
+
+ };
+
+
+ $scope.restartMySQL = function () {
+ $scope.cyberPanelLoading = false;
+
+ url = "/dataBases/restartMySQL";
+
+ var data = {};
+
+ var config = {
+ headers: {
+ 'X-CSRFToken': getCookie('csrftoken')
+ }
+ };
+
+
+ $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
+
+
+ function ListInitialDatas(response) {
+ $scope.cyberPanelLoading = true;
+ if (response.data.status === 1) {
+ new PNotify({
+ title: 'Success',
+ text: 'Successfully Done',
+ type: 'success'
+ });
+ } else {
+ new PNotify({
+ title: 'Error!',
+ text: response.data.error_message,
+ type: 'error'
+ });
+ }
+
+ }
+
+ function cantLoadInitialData(response) {
+ $scope.cyberhosting = true;
+ new PNotify({
+ title: 'Error!',
+ text: 'Could not connect to server, please refresh this page.',
+ type: 'error'
+ });
+ }
+ }
+})
\ No newline at end of file
diff --git a/databases/static/databases/hourglass.png b/databases/static/databases/hourglass.png
new file mode 100644
index 000000000..dad3738b1
Binary files /dev/null and b/databases/static/databases/hourglass.png differ
diff --git a/databases/static/databases/link.png b/databases/static/databases/link.png
new file mode 100644
index 000000000..82bcd06d5
Binary files /dev/null and b/databases/static/databases/link.png differ
diff --git a/databases/static/databases/snail.png b/databases/static/databases/snail.png
new file mode 100644
index 000000000..eb80531df
Binary files /dev/null and b/databases/static/databases/snail.png differ
diff --git a/databases/templates/databases/OptimizeMySQL.html b/databases/templates/databases/OptimizeMySQL.html
new file mode 100644
index 000000000..a4a37eb15
--- /dev/null
+++ b/databases/templates/databases/OptimizeMySQL.html
@@ -0,0 +1,70 @@
+{% extends "baseTemplate/index.html" %}
+{% load i18n %}
+{% block title %}{% trans "Mysql Manager - CyberPanel" %}{% endblock %}
+{% block content %}
+
+ {% load static %}
+ {% get_current_language as LANGUAGE_CODE %}
+
+
+
+
+
+
+{% endblock %}
diff --git a/databases/templates/databases/mysqlmanager.html b/databases/templates/databases/mysqlmanager.html
new file mode 100644
index 000000000..c38ae4c89
--- /dev/null
+++ b/databases/templates/databases/mysqlmanager.html
@@ -0,0 +1,129 @@
+{% extends "baseTemplate/index.html" %}
+{% load i18n %}
+{% block title %}{% trans "Mysql Manager - CyberPanel" %}{% endblock %}
+{% block content %}
+
+ {% load static %}
+ {% get_current_language as LANGUAGE_CODE %}
+
+
+
+ {% trans "Optimize MySQL" %}
+
+
+ {% trans "Optimize MySQL" %} 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Detected Ram: {{ ramInGB }}
+
+
+
+
+
+
+
+{% endblock %}
diff --git a/databases/urls.py b/databases/urls.py
index 02a514f83..8e82d52cc 100755
--- a/databases/urls.py
+++ b/databases/urls.py
@@ -7,6 +7,12 @@ urlpatterns = [
url(r'^submitDBCreation', views.submitDBCreation, name='submitDBCreation'),
url(r'^deleteDatabase', views.deleteDatabase, name='deleteDatabase'),
url(r'^fetchDatabases', views.fetchDatabases, name='fetchDatabases'),
+ url(r'^MysqlManager', views.MySQLManager, name='MysqlManager'),
+ url(r'^OptimizeMySQL', views.OptimizeMySQL, name='OptimizeMySQL'),
+ url(r'^getMysqlstatus', views.getMysqlstatus, name='getMysqlstatus'),
+ url(r'^restartMySQL', views.restartMySQL, name='restartMySQL'),
+ url(r'^generateRecommendations', views.generateRecommendations, name='generateRecommendations'),
+ url(r'^applyMySQLChanges', views.applyMySQLChanges, name='applyMySQLChanges'),
url(r'^submitDatabaseDeletion', views.submitDatabaseDeletion, name='submitDatabaseDeletion'),
diff --git a/databases/views.py b/databases/views.py
index f079b99b8..19e924c7b 100755
--- a/databases/views.py
+++ b/databases/views.py
@@ -2,8 +2,11 @@
from django.shortcuts import redirect, HttpResponse
+
+from cloudAPI.cloudManager import CloudManager
from loginSystem.views import loadLoginPage
from .databaseManager import DatabaseManager
+from .mysqlOptimizer import MySQLOptimizer
from .pluginManager import pluginManager
import json
from plogical.processUtilities import ProcessUtilities
@@ -14,6 +17,8 @@ from plogical import randomPassword
from cryptography.fernet import Fernet
from plogical.mysqlUtilities import mysqlUtilities
from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging
+
+
# Create your views here.
def loadDatabaseHome(request):
@@ -24,6 +29,7 @@ def loadDatabaseHome(request):
except KeyError:
return redirect(loadLoginPage)
+
def createDatabase(request):
try:
result = pluginManager.preCreateDatabase(request)
@@ -39,10 +45,11 @@ def createDatabase(request):
return result
return coreResult
-
+
except KeyError:
return redirect(loadLoginPage)
+
def submitDBCreation(request):
try:
userID = request.session['userID']
@@ -63,6 +70,7 @@ def submitDBCreation(request):
except KeyError:
return redirect(loadLoginPage)
+
def deleteDatabase(request):
try:
userID = request.session['userID']
@@ -71,6 +79,7 @@ def deleteDatabase(request):
except KeyError:
return redirect(loadLoginPage)
+
def fetchDatabases(request):
try:
userID = request.session['userID']
@@ -79,6 +88,7 @@ def fetchDatabases(request):
except KeyError:
return redirect(loadLoginPage)
+
def submitDatabaseDeletion(request):
try:
userID = request.session['userID']
@@ -97,6 +107,7 @@ def submitDatabaseDeletion(request):
except KeyError:
return redirect(loadLoginPage)
+
def listDBs(request):
try:
userID = request.session['userID']
@@ -105,6 +116,7 @@ def listDBs(request):
except KeyError:
return redirect(loadLoginPage)
+
def changePassword(request):
try:
userID = request.session['userID']
@@ -124,6 +136,7 @@ def changePassword(request):
except KeyError:
return redirect(loadLoginPage)
+
def remoteAccess(request):
try:
userID = request.session['userID']
@@ -135,6 +148,7 @@ def remoteAccess(request):
except KeyError:
return redirect(loadLoginPage)
+
def allowRemoteIP(request):
try:
userID = request.session['userID']
@@ -146,6 +160,7 @@ def allowRemoteIP(request):
except KeyError:
return redirect(loadLoginPage)
+
def phpMyAdmin(request):
try:
userID = request.session['userID']
@@ -154,12 +169,12 @@ def phpMyAdmin(request):
except KeyError:
return redirect(loadLoginPage)
+
def generateAccess(request):
try:
-
userID = request.session['userID']
- admin = Administrator.objects.get(id = userID)
+ admin = Administrator.objects.get(id=userID)
currentACL = ACLManager.loadedACL(userID)
## if user ACL is admin login as root
@@ -181,13 +196,12 @@ def generateAccess(request):
password = randomPassword.generate_pass()
token = randomPassword.generate_pass()
- GlobalUserDB(username=admin.userName, password=password,token=token).save()
+ GlobalUserDB(username=admin.userName, password=password, token=token).save()
data_ret = {'status': 1, 'token': token, 'username': admin.userName}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
-
keySavePath = '/home/cyberpanel/phpmyadmin_%s' % (admin.userName)
try:
GlobalUserDB.objects.get(username=admin.userName).delete()
@@ -237,18 +251,17 @@ def generateAccess(request):
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
+
def fetchDetailsPHPMYAdmin(request):
try:
-
userID = request.session['userID']
- admin = Administrator.objects.get(id = userID)
+ admin = Administrator.objects.get(id=userID)
currentACL = ACLManager.loadedACL(userID)
token = request.GET.get('token')
username = request.GET.get('username')
-
if username != admin.userName:
return redirect(loadLoginPage)
@@ -268,7 +281,7 @@ def fetchDetailsPHPMYAdmin(request):
password = jsonData['mysqlpassword']
returnURL = '/phpmyadmin/phpmyadminsignin.php?username=%s&password=%s' % (
- mysqluser, password)
+ mysqluser, password)
return redirect(returnURL)
except BaseException:
@@ -302,4 +315,87 @@ def fetchDetailsPHPMYAdmin(request):
except BaseException as msg:
data_ret = {'status': 0, 'createDBStatus': 0, 'error_message': str(msg)}
json_data = json.dumps(data_ret)
- return HttpResponse(json_data)
\ No newline at end of file
+ return HttpResponse(json_data)
+
+
+def MySQLManager(request):
+ try:
+ userID = request.session['userID']
+ dm = DatabaseManager()
+ return dm.MySQLManager(request, userID)
+ except KeyError:
+ return redirect(loadLoginPage)
+
+
+def OptimizeMySQL(request):
+ try:
+ userID = request.session['userID']
+ dm = DatabaseManager()
+ return dm.OptimizeMySQL(request, userID)
+ except KeyError:
+ return redirect(loadLoginPage)
+
+
+def getMysqlstatus(request):
+ try:
+ userID = request.session['userID']
+ finalData = mysqlUtilities.showStatus()
+
+ finalData = json.dumps(finalData)
+ return HttpResponse(finalData)
+
+ except KeyError:
+ return redirect(loadLoginPage)
+
+
+def restartMySQL(request):
+ try:
+ userID = request.session['userID']
+ finalData = mysqlUtilities.restartMySQL()
+
+ data = {}
+
+ data['status'] = finalData[0]
+ data['error_message'] = finalData[1]
+ json_data = json.dumps(data)
+ return HttpResponse(json_data)
+
+ except KeyError:
+ return redirect(loadLoginPage)
+
+
+def generateRecommendations(request):
+ try:
+ userID = request.session['userID']
+
+ data = json.loads(request.body)
+ detectedRam = data['detectedRam']
+
+ data = {}
+ data['status'] = 1
+ data['generatedConf'] = MySQLOptimizer.generateRecommendations(detectedRam)
+
+ final_json = json.dumps(data)
+ return HttpResponse(final_json)
+
+ except KeyError:
+ return redirect(loadLoginPage)
+
+
+def applyMySQLChanges(request):
+ try:
+ userID = request.session['userID']
+ data = json.loads(request.body)
+ logging.writeToFile("=-------------------------------------------")
+ finalData = mysqlUtilities.applyMySQLChanges(data)
+
+ data = {}
+
+ data['status'] = finalData[0]
+ data['error_message'] = finalData[1]
+
+ final_json = json.dumps(data)
+ return HttpResponse(final_json)
+
+ except KeyError:
+ return redirect(loadLoginPage)
diff --git a/plogical/mysqlUtilities.py b/plogical/mysqlUtilities.py
index f3367d01b..c115cb690 100755
--- a/plogical/mysqlUtilities.py
+++ b/plogical/mysqlUtilities.py
@@ -1,4 +1,6 @@
import os,sys
+from urllib.parse import unquote
+
sys.path.append('/usr/local/CyberCP')
import django
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
@@ -583,7 +585,8 @@ password=%s
command = 'sudo mv /etc/my.cnf /etc/my.cnf.bak'
else:
command = 'sudo mv /etc/mysql/my.cnf /etc/mysql/my.cnf.bak'
- data['suggestedContent'] = data['suggestedContent'].replace('/var/lib/mysql/mysql.sock', '/var/run/mysqld/mysqld.sock')
+ decoded_content = unquote(data['suggestedContent'])
+ data['suggestedContent'] = decoded_content.replace('/var/lib/mysql/mysql.sock', '/var/run/mysqld/mysqld.sock')
ProcessUtilities.executioner(command)
+ {% trans "MySQL Manager" %}
+
+
+ {% trans "MySQL Manager" %}
+
+
+
+
+
+
+
+
+
+
+ MySQL status
+ + + Optimize MySQL + +
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+ + MySQL Uptime +
+
+
+
+ {$ uptime $}
+ + +
+
+
+
+
+
+
+ 
+
+
+
+ + Connections +
+
+
+
+ {$ connections $}
+ + +
+
+
+
+
+
+
+
+ 
+
+
+
+ + Slow Queries +
+
+
+
+ {$ Slow_queries $}
+ + +
+
+
+
+
+
+ MySQL Processes
+
+
+
+
+
+ | ID | +User | +Database | +Command | +Time | +State | +Info | +Progress | +
|---|---|---|---|---|---|---|---|
| + | + | + | + | + | + | + | + |