From 1c47a4cc2f7616f0569f9b1d08e98e0c9ee591ad Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Sat, 20 Jul 2024 12:16:00 +0800 Subject: [PATCH] update --- plugins/zabbix/index.py | 5 ++++- plugins/zabbix/versions/7.0/opensuse.sh | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/zabbix/index.py b/plugins/zabbix/index.py index 36d611160..a9b7db3ef 100755 --- a/plugins/zabbix/index.py +++ b/plugins/zabbix/index.py @@ -242,7 +242,10 @@ def zabbixImportMySQLDataFile(): return '/usr/share/zabbix-sql-scripts/mysql/server.sql.gz' def zabbixImportMySQLData(): - getMySQLConf() + mysql_conf = getMySQLConf() + if os.path.exists(mysql_conf): + exit("需要安装MySQL") + choose_mysql = getServerDir()+'/mysql.pl' ver = mw.readFile(choose_mysql) diff --git a/plugins/zabbix/versions/7.0/opensuse.sh b/plugins/zabbix/versions/7.0/opensuse.sh index 303568a8e..efbb136e0 100644 --- a/plugins/zabbix/versions/7.0/opensuse.sh +++ b/plugins/zabbix/versions/7.0/opensuse.sh @@ -26,13 +26,13 @@ Install_App() echo "rpm -Uvh https://repo.zabbix.com/zabbix/7.0/sles/${SYS_VERSION_ID:0:2}/x86_64/${ZABBIX_NAME}" # cd $serverPath/source/zabbix && rpm -Uvh ${ZABBIX_NAME} - zypper install -y zabbix-server-mysql zabbix-web-mysql zabbix-sql-scripts zabbix-selinux-policy + zypper install -y zabbix-server-mysql zabbix-web-mysql zabbix-sql-scripts zypper install -y zabbix-agent } Uninstall_App() { - zypper remove -y zabbix-server-mysql zabbix-web-mysql zabbix-sql-scripts zabbix-selinux-policy + zypper remove -y zabbix-server-mysql zabbix-web-mysql zabbix-sql-scripts zypper remove -y zabbix-agent rm -rf /etc/zabbix echo "卸载成功"