Merge pull request #618 from midoks/dev

增加zabbix插件
midoks · Jul 20, 2024 · 5045af8 · 5045af8
2 parents bd6d063 + 59f8080
commit 5045af8
Show file tree

Hide file tree

Showing 65 changed files with 5,199 additions and 217 deletions.
diff --git a/class/core/site_api.py b/class/core/site_api.py
@@ -2533,7 +2533,9 @@ def setSecurity(self, sid, name, fix, domains, status, none=''):
 
     def getPhpVersion(self):
         phpVersions = ('00', '52', '53', '54', '55',
-                       '56', '70', '71', '72', '73', '74', '80', '81', '82', '83')
+                       '56', '70', '71', '72', '73',
+                       '74', '80', '81', '82', '83',
+                       '84')
         data = []
         for val in phpVersions:
             tmp = {}
@@ -2667,10 +2669,8 @@ def add(self, webname, port, ps, path, version):
             return mw.returnJson(False, '不要以网站根目录创建站点!')
 
         siteMenu = json.loads(webname)
-        self.siteName = self.toPunycode(
-            siteMenu['domain'].strip().split(':')[0]).strip()
-        self.sitePath = self.toPunycodePath(
-            self.getPath(path.replace(' ', '')))
+        self.siteName = self.toPunycode(siteMenu['domain'].strip().split(':')[0]).strip()
+        self.sitePath = self.toPunycodePath(self.getPath(path.replace(' ', '')))
         self.sitePort = port.strip().replace(' ', '')
         self.phpVersion = version
 

diff --git a/plugins/clean/index.py b/plugins/clean/index.py
@@ -125,6 +125,7 @@ def initConf():
             "/var/log/secure",
             "/var/log/lastlog",
             "/var/log/cron",
+            "/www/wwwlogs",
             "/www/server/rsyncd",
             "/www/server/sphinx/index",
             "/www/server/mongodb/logs",

diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py
@@ -3461,23 +3461,17 @@ def fullSync(version=''):
 
 
 def installPreInspection(version):
+    cmd = "cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'"
+    sys = mw.execShell(cmd)
 
-
-
-    sys = mw.execShell(
-        "cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'")
-
-    if sys[1] != '':
-        return '不支持改系统'
-
-    sys_id = mw.execShell(
-        "cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
+    cmd = "cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F '\"' '{print $2}'"
+    sys_id = mw.execShell(cmd)
 
     sysName = sys[0].strip().lower()
     sysId = sys_id[0].strip()
 
-    if not sysName in ('centos',):
-        return '仅支持centos'
+    if not sysName in ['centos','almalinux','rocky','opensuse']:
+        return '仅支持centos,almalinux,rocky,opensuse'
 
     if (sysName == 'centos' and version == '5.7' and not sysId in('7',)):
         return 'mysql5.7 仅支持centos7'

diff --git a/plugins/mysql-yum/install.sh b/plugins/mysql-yum/install.sh
@@ -8,7 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 
-# cd /www/server/mdserver-web/plugins/mysql-yum && bash install.sh install 8.4
+# cd /www/server/mdserver-web/plugins/mysql-yum && bash install.sh install 8.0
 # cd /www/server/mdserver-web/plugins/mysql-yum && bash install.sh uninstall 8.0
 # cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-yum/index.py start 8.0
 # cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mysql-yum/index.py get_master_status 8.4

diff --git a/plugins/mysql-yum/versions/5.7/install.sh b/plugins/mysql-yum/versions/5.7/install.sh
@@ -39,11 +39,11 @@ if [ "$OSNAME" == "centos" ];then
 	OS_SIGN=1.el${VERSION_ID}
 elif [ "$OSNAME" == "fedora" ]; then
 	OS_SIGN=10.fc${VERSION_ID}
-elif [ "$OSNAME" == "suse" ]; then
-	OS_SIGN=1.sl${VERSION_ID}
+elif [ "$OSNAME" == "opensuse" ]; then
+	OS_SIGN=1.sl${VERSION_ID:0:2}
 fi
 
-MYSQL_VER=5.7.39
+MYSQL_VER=5.7.44
 SUFFIX_NAME=${MYSQL_VER}-${OS_SIGN}.${ARCH}
 
 YUM_INSTALL()
@@ -74,6 +74,37 @@ rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
 #######
 }
 
+ZYPPER_INSTALL()
+{
+zypper install -y libstdc++6
+
+mkdir -p /var/run/mysqld
+chown mysql -R /var/run/mysqld
+#######
+mkdir -p $myDir
+
+wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar
+echo "wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar"
+cd ${myDir} && tar vxf mysql-${SUFFIX_NAME}.rpm-bundle.tar
+
+mkdir -p ${serverPath}/mysql-yum/bin && cd ${serverPath}/mysql-yum/bin
+
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.x86_64.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-common-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-debuginfo-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-devel-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-embedded-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-icu-data-files-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-debug-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
+
+#######
+}
+
 YUM_UNINSTALL()
 {
 ### YUM卸载 START ########
@@ -94,6 +125,11 @@ Install_mysql()
 	if [ "$isYum" != "" ];then
 		YUM_INSTALL
 	fi
+
+	isZypper=`which zypper`
+	if [ "$isZypper" != "" ];then
+		ZYPPER_INSTALL
+	fi
 
 	rm -rf $myDir
 	echo '5.7' > $serverPath/mysql-yum/version.pl
@@ -102,10 +138,7 @@ Install_mysql()
 
 Uninstall_mysql()
 {
-	isYum=`which yum`
-	if [ "$isYum" != "" ];then
-		YUM_UNINSTALL
-	fi
+	YUM_UNINSTALL
 	rm -rf $serverPath/mysql-yum
 	echo '卸载完成' > $install_tmp
 }

diff --git a/plugins/mysql-yum/versions/8.0/install.sh b/plugins/mysql-yum/versions/8.0/install.sh
@@ -35,11 +35,11 @@ if [ "$OSNAME" == "centos" ];then
 	OS_SIGN=1.el${VERSION_ID}
 elif [ "$OSNAME" == "fedora" ]; then
 	OS_SIGN=10.fc${VERSION_ID}
-elif [ "$OSNAME" == "suse" ]; then
-	OS_SIGN=1.sl${VERSION_ID}
+elif [ "$OSNAME" == "opensuse" ]; then
+	OS_SIGN=1.sl${VERSION_ID:0:2}
 fi
 
-MYSQL_VER=8.0.30
+MYSQL_VER=8.0.37
 SUFFIX_NAME=${MYSQL_VER}-${OS_SIGN}.${ARCH}
 
 YUM_INSTALL()
@@ -71,6 +71,37 @@ rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
 #######
 }
 
+ZYPPER_INSTALL()
+{
+zypper install -y libstdc++6
+
+mkdir -p /var/run/mysqld
+chown mysql -R /var/run/mysqld
+#######
+mkdir -p $myDir
+
+wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar
+echo "wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar"
+cd ${myDir} && tar vxf mysql-${SUFFIX_NAME}.rpm-bundle.tar
+
+mkdir -p ${serverPath}/mysql-yum/bin && cd ${serverPath}/mysql-yum/bin
+
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.x86_64.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-common-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-debuginfo-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-devel-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-embedded-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-icu-data-files-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-debug-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
+
+#######
+}
+
 YUM_UNINSTALL()
 {
 ### YUM卸载 START ########
@@ -94,6 +125,11 @@ Install_mysql()
 		YUM_INSTALL
 	fi
 
+	isZypper=`which zypper`
+	if [ "$isZypper" != "" ];then
+		ZYPPER_INSTALL
+	fi
+
 	rm -rf $myDir	
 
 	echo '8.0' > $serverPath/mysql-yum/version.pl
@@ -102,10 +138,7 @@ Install_mysql()
 
 Uninstall_mysql()
 {
-	isYum=`which yum`
-	if [ "$isYum" != "" ];then
-		YUM_UNINSTALL
-	fi
+	YUM_UNINSTALL
 	rm -rf $serverPath/mysql-yum
 	echo '卸载完成'
 }

diff --git a/plugins/mysql-yum/versions/8.2/install.sh b/plugins/mysql-yum/versions/8.2/install.sh
@@ -35,8 +35,8 @@ if [ "$OSNAME" == "centos" ];then
 	OS_SIGN=1.el${VERSION_ID}
 elif [ "$OSNAME" == "fedora" ]; then
 	OS_SIGN=10.fc${VERSION_ID}
-elif [ "$OSNAME" == "suse" ]; then
-	OS_SIGN=1.sl${VERSION_ID}
+elif [ "$OSNAME" == "opensuse" ]; then
+	OS_SIGN=1.sl${VERSION_ID:0:2}
 fi
 
 MYSQL_VER=8.2.0
@@ -72,6 +72,37 @@ rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
 #######
 }
 
+ZYPPER_INSTALL()
+{
+zypper install -y libstdc++6
+
+mkdir -p /var/run/mysqld
+chown mysql -R /var/run/mysqld
+#######
+mkdir -p $myDir
+
+wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar
+echo "wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar"
+cd ${myDir} && tar vxf mysql-${SUFFIX_NAME}.rpm-bundle.tar
+
+mkdir -p ${serverPath}/mysql-yum/bin && cd ${serverPath}/mysql-yum/bin
+
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.x86_64.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-common-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-debuginfo-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-devel-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-embedded-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-icu-data-files-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-debug-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
+
+#######
+}
+
 YUM_UNINSTALL()
 {
 ### YUM卸载 START ########
@@ -96,6 +127,11 @@ Install_mysql()
 		YUM_INSTALL
 	fi
 
+	isZypper=`which zypper`
+	if [ "$isZypper" != "" ];then
+		ZYPPER_INSTALL
+	fi
+
 	rm -rf $myDir	
 
 	echo '8.2' > $serverPath/mysql-yum/version.pl
@@ -104,10 +140,7 @@ Install_mysql()
 
 Uninstall_mysql()
 {
-	isYum=`which yum`
-	if [ "$isYum" != "" ];then
-		YUM_UNINSTALL
-	fi
+	YUM_UNINSTALL
 	rm -rf $serverPath/mysql-yum
 	echo '卸载完成'
 }

diff --git a/plugins/mysql-yum/versions/8.3/install.sh b/plugins/mysql-yum/versions/8.3/install.sh
@@ -35,8 +35,8 @@ if [ "$OSNAME" == "centos" ];then
 	OS_SIGN=1.el${VERSION_ID}
 elif [ "$OSNAME" == "fedora" ]; then
 	OS_SIGN=10.fc${VERSION_ID}
-elif [ "$OSNAME" == "suse" ]; then
-	OS_SIGN=1.sl${VERSION_ID}
+elif [ "$OSNAME" == "opensuse" ]; then
+	OS_SIGN=1.sl${VERSION_ID:0:2}
 fi
 
 MYSQL_VER=8.3.0
@@ -72,6 +72,37 @@ rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
 #######
 }
 
+ZYPPER_INSTALL()
+{
+zypper install -y libstdc++6
+
+mkdir -p /var/run/mysqld
+chown mysql -R /var/run/mysqld
+#######
+mkdir -p $myDir
+
+wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar
+echo "wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar"
+cd ${myDir} && tar vxf mysql-${SUFFIX_NAME}.rpm-bundle.tar
+
+mkdir -p ${serverPath}/mysql-yum/bin && cd ${serverPath}/mysql-yum/bin
+
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-client-${SUFFIX_NAME}.x86_64.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-common-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-debuginfo-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-devel-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-embedded-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-icu-data-files-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-libs-compat-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-server-debug-${SUFFIX_NAME}.rpm | cpio -div
+rpm2cpio ${myDir}/mysql-community-test-${SUFFIX_NAME}.rpm | cpio -div
+
+#######
+}
+
 YUM_UNINSTALL()
 {
 ### YUM卸载 START ########
@@ -96,6 +127,11 @@ Install_mysql()
 		YUM_INSTALL
 	fi
 
+	isZypper=`which zypper`
+	if [ "$isZypper" != "" ];then
+		ZYPPER_INSTALL
+	fi
+
 	rm -rf $myDir	
 
 	echo '8.3' > $serverPath/mysql-yum/version.pl
@@ -104,10 +140,7 @@ Install_mysql()
 
 Uninstall_mysql()
 {
-	isYum=`which yum`
-	if [ "$isYum" != "" ];then
-		YUM_UNINSTALL
-	fi
+	YUM_UNINSTALL
 	rm -rf $serverPath/mysql-yum
 	echo '卸载完成'
 }