diff --git a/deps/3_prometheus/install.sh b/deps/3_prometheus/install.sh index 0632154628068de0ef4919e6bddf6176193291c1..281febca69931d67c0af84ee412f527aa4085a3d 100644 --- a/deps/3_prometheus/install.sh +++ b/deps/3_prometheus/install.sh @@ -6,7 +6,7 @@ PROMETHEUS_VER=2.29.1 PROMETHEUS_ARCH=linux-amd64 if [ "${ARCH}" == "aarch64" ] then - PROMETHEUS_ARCH=linue-arm64 + PROMETHEUS_ARCH=linux-arm64 fi PROMETHEUS_PKG=prometheus-${PROMETHEUS_VER}.${PROMETHEUS_ARCH} PROMETHEUS_TAR=$PROMETHEUS_PKG.tar.gz diff --git a/docs/custom_diagnosis.md b/docs/custom_diagnosis.md index c7ebe253c83b88635379fe769886dafb96951aa8..9e9f1b5d1250adac8b80f6d36640ef3a6021de6a 100644 --- a/docs/custom_diagnosis.md +++ b/docs/custom_diagnosis.md @@ -28,7 +28,7 @@ > **注意：诊断页面配置定义了诊断结果的渲染方式和数据格式，后处理脚本返回的结果要和此处匹配** > -> - 每个面板（pannel）都有对应的数据格式要求，详情请看 [docs/diagnosis_center.md](https://gitee.com/anolis/sysom/blob/master/docs/diagnosis_center.md) +> - 每个面板（panel）都有对应的数据格式要求，详情请看 [docs/diagnosis_center.md](https://gitee.com/anolis/sysom/blob/master/docs/diagnosis_center.md) - （未部署）源码路径：sysom/sysom_web/public/resource/diagnose/v1/custom/demo.json - （已部署）部署路径：/usr/local/sysom/web/resource/diagnose/v1/custom/demo.json diff --git a/docs/develop_guide.md b/docs/develop_guide.md index bd97740f6310a75e3e17ded6c43eb658f43dd88b..743452e43091fc18dad180e7692e8d0dc2f147f1 100644 --- a/docs/develop_guide.md +++ b/docs/develop_guide.md @@ -31,7 +31,7 @@ - Grafana - `docker`：Dockerfile 配置目录，用于生成 SysOM 容器； - `docs`：项目文档目录，包含用户使用手册和开发文档； -- `enviroment`：开发环境目录，定义了微服务开发所需要的公共环境，目前包括以下两个部分： +- `environment`：开发环境目录，定义了微服务开发所需要的公共环境，目前包括以下两个部分： - env => 微服务公共虚拟环境 - sdk => SysOM 平台自研 SDK 目录 - `LICENSE`：项目 license； diff --git a/script/sysom_clear.sh b/script/sysom_clear.sh index 4c6a29f3ae9505da2e7dac7068bd17a6c7cb25b5..82ffd651675035f057ce6d09e2f90ef77403efbb 100755 --- a/script/sysom_clear.sh +++ b/script/sysom_clear.sh @@ -103,7 +103,7 @@ sub_help() { echo "Usage: $ProgName [options]" echo "Subcommands:" echo " all Clear all modules" - echo " env [ALL | ] Clear all enviroment or specific enviroment" + echo " env [ALL | ] Clear all environment or specific environment" echo " Example: $ProgName env env" echo " Example: $ProgName env sdk" echo " deps [ALL | ] Clear all deps or specific dep" diff --git a/script/sysom_init.sh b/script/sysom_init.sh index 3e349ccaaa51d2842af2b5c358aec3a98c64fa74..e33fc4e440b42d54db444e0a916cdaa4143582f4 100755 --- a/script/sysom_init.sh +++ b/script/sysom_init.sh @@ -144,7 +144,7 @@ sub_help() { echo "Usage: $ProgName [options]" echo "Subcommands:" echo " all Init all modules" - echo " env [ALL | ] Init all enviroment or specific enviroment" + echo " env [ALL | ] Init all environment or specific environment" echo " Example: $ProgName env env" echo " Example: $ProgName env sdk" echo " deps [ALL | ] Init all deps or specific dep" diff --git a/script/sysom_start.sh b/script/sysom_start.sh index 9687decd91f238221723de93001f8686a6be7240..84552a4e51e5e92460be977d957a5a53c07f1122 100755 --- a/script/sysom_start.sh +++ b/script/sysom_start.sh @@ -113,7 +113,7 @@ sub_help() { echo "Usage: $ProgName [options]" echo "Subcommands:" echo " all Start all modules" - echo " env [ALL | ] Start all enviroment or specific enviroment" + echo " env [ALL | ] Start all environment or specific environment" echo " Example: $ProgName env env" echo " Example: $ProgName env sdk" echo " deps [ALL | ] Start all deps or specific dep" diff --git a/script/sysom_stop.sh b/script/sysom_stop.sh index ad66d6a1f84962ff49643efc8f28a30928da1da9..d901abc5a0f4d39aac67bfbc3af71839cacbf475 100755 --- a/script/sysom_stop.sh +++ b/script/sysom_stop.sh @@ -115,7 +115,7 @@ sub_help() { echo "Usage: $ProgName [options]" echo "Subcommands:" echo " all Stop all modules" - echo " env [ALL | ] Stop all enviroment or specific enviroment" + echo " env [ALL | ] Stop all environment or specific environment" echo " Example: $ProgName env env" echo " Example: $ProgName env sdk" echo " deps [ALL | ] Stop all deps or specific dep" @@ -148,7 +148,7 @@ sub_env() { sub_environment() { target=$1 if [ "$target" == "ALL" ]; then - # Stop all enviroment + # Stop all environment for env in $(ls -r $ENVIRONMENT_HOME); do if [ ! -d "${ENVIRONMENT_HOME}/${env}" ]; then continue @@ -156,7 +156,7 @@ sub_environment() { do_stop_environment $env done else - # Stop specific enviroment + # Stop specific environment do_stop_environment $target fi } diff --git a/script/sysom_uninstall.sh b/script/sysom_uninstall.sh index 8086839c1360c8084b224316bc2e8e3d129ca738..efa3ca43668ac545ba3a8d773fe6ef97f6f86b69 100755 --- a/script/sysom_uninstall.sh +++ b/script/sysom_uninstall.sh @@ -137,7 +137,7 @@ sub_help() { echo "Usage: $ProgName [options]" echo "Subcommands:" echo " all Uninstall all modules" - echo " env [ALL | ] Uninstall all enviroment or specific enviroment" + echo " env [ALL | ] Uninstall all environment or specific environment" echo " Example: $ProgName env env" echo " Example: $ProgName env sdk" echo " deps [ALL | ] Uninstall all deps or specific dep" diff --git a/script/sysom_update.sh b/script/sysom_update.sh index 935f22c1538b5e7fa74cf7979068ac1ed731659b..d92b6485edfa1e431d54290012fdd313fa855c33 100644 --- a/script/sysom_update.sh +++ b/script/sysom_update.sh @@ -150,7 +150,7 @@ sub_help() { echo "Usage: $ProgName [options]" echo "Subcommands:" echo " all Update all modules" - echo " env [ALL | ] Update all enviroment or specific enviroment" + echo " env [ALL | ] Update all environment or specific environment" echo " Example: $ProgName env env" echo " Example: $ProgName env sdk" echo " deps [ALL | ] Update all deps or specific dep" @@ -183,7 +183,7 @@ sub_env() { sub_environment() { target=$1 if [ "$target" == "ALL" ]; then - # Start all enviroment + # Start all environment for env in $(ls $ENVIRONMENT_HOME); do if [ ! -d "${ENVIRONMENT_HOME}/${env}" ]; then continue @@ -191,7 +191,7 @@ sub_environment() { do_update_environment $env done else - # Start specific enviroment + # Start specific environment do_update_environment $target fi }