From b0b029a3191db83cf9888119296fee241f757ab0 Mon Sep 17 00:00:00 2001 From: actor168 Date: Fri, 6 Oct 2023 19:57:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20sysom=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=AE=BE=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/server/0_local_services/init.sh | 10 ++++++++-- script/server/1_sysom_monitor/grafana_api_set.sh | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/script/server/0_local_services/init.sh b/script/server/0_local_services/init.sh index e3acc951..60159235 100755 --- a/script/server/0_local_services/init.sh +++ b/script/server/0_local_services/init.sh @@ -10,13 +10,19 @@ REDIS_DIR=redis-5.0.14 REDIS_PKG=redis-5.0.14.tar.gz usr_local_redis=0 +SYSOM_CONF=${SERVER_HOME}/target/conf/config.yml +SYSOM_DATABASE_HOST=`cat $SYSOM_CONF | grep mysql -A5 | grep host | awk '{print $NF}'` +SYSOM_DATABASE_PORT=`cat $SYSOM_CONF | grep mysql -A5 | grep port | awk '{print $NF}'` +SYSOM_DATABASE_USER=`cat $SYSOM_CONF | grep mysql -A5 | grep user | awk '{print $NF}'` +SYSOM_DATABASE_PASSWORD=`cat $SYSOM_CONF | grep mysql | grep password | awk '{print $NF}'` + setup_database() { echo "INFO: begin create db..." systemctl restart mariadb.service systemctl enable mariadb.service - mysql -uroot -e "create user if not exists 'sysom'@'%' identified by 'sysom_admin';" - mysql -uroot -e "grant usage on *.* to 'sysom'@'localhost' identified by 'sysom_admin'" + mysql -uroot -e "create user if not exists 'sysom'@'%' identified by '${SYSOM_DATABASE_PASSWORD}';" + mysql -uroot -e "grant usage on *.* to 'sysom'@'localhost' identified by '${SYSOM_DATABASE_PASSWORD}'" mysql -uroot -e "create database sysom character set utf8;" mysql -uroot -e "create database grafana character set utf8;" mysql -uroot -e "grant all privileges on sysom.* to 'sysom'@'%';" diff --git a/script/server/1_sysom_monitor/grafana_api_set.sh b/script/server/1_sysom_monitor/grafana_api_set.sh index 6c8f8621..da3d36c3 100755 --- a/script/server/1_sysom_monitor/grafana_api_set.sh +++ b/script/server/1_sysom_monitor/grafana_api_set.sh @@ -67,7 +67,7 @@ fi curl -c cookie -b cookie --location --request POST 'http://127.0.0.1:3000/api/datasources' \ --header 'Content-Type: application/json' \ ---data '{"name": "sysom-mysql", "type": "mysql", "url": "localhost:3306","access": "proxy", "user":"sysom", "database": "sysom", "secureJsonData": {"password": "sysom_admin"}}' +--data '{"name": "sysom-mysql", "type": "mysql", "url": "localhost:3306","access": "proxy", "user":"sysom", "database": "sysom", "secureJsonData": {"password": "'${SYSOM_DATABASE_PASSWORD}'"}}' if [ $? -ne 0 ] then echo "grafana configure prometheus datasource error" -- Gitee