Fix Coroutine Leaks and Proxy Handling in http.Client (#304)

* fix: builtin variable conflict

* feat: add pkg/utils/http HttpClientSkipTlsVerify HttpClient

* fix: realtime create http Transport

* fix: http keepalive connection may not reusable

* feat: allow http request use proxy from environment

.github/workflows/release.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: fix dist
         run: |
-          cp dist/dashboard-linux-arm-7 dist/dashboard-linux-arm
+          mv dist/dashboard-linux-arm-7 dist/dashboard-linux-arm
 
       - name: Log in to the GHCR
         uses: docker/login-action@master

.github/workflows/sync.yml

@@ -11,6 +11,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: adambirds/[email protected]
         with:
-          destination_repository: git@jihulab.com:nezha/dashboard.git
+          destination_repository: git@gitee.com:naibahq/nezha.git
           destination_branch_name: master
           destination_ssh_key: ${{ secrets.GITLAB_SSH_KEY }}

.github/workflows/test.yml

@@ -4,14 +4,12 @@ on:
   push:
     branches:
       - master
-    paths-ignore:
+    paths:
-      - ".github/workflows/codeql-analysis.yml"
+      - "**.go"
-      - ".github/workflows/test-on-pr.yml"
+      - "go.mod"
-      - ".github/workflows/contributors.yml"
+      - "go.sum"
-      - ".github/workflows/sync.yml"
+      - "resource/**"
-      - ".github/workflows/release.yml"
+      - ".github/workflows/test.yml"
-      - "README.md"
-      - ".goreleaser.yml"
 
 jobs:
   tests:

.gitignore

@@ -19,4 +19,4 @@
 /cmd/dashboard/main
 /config.yml
 /resource/template/theme-custom
-/resource/static/theme-custom
+/resource/static/custom

README.md

@@ -4,7 +4,7 @@
   <br>
   <small><i>LOGO designed by <a href="https://xio.ng" target="_blank">熊大</a> .</i></small>
   <br><br>
-<img alt="GitHub release (with filter)" src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&style=for-the-badge&logo=github&label=Dashboard">&nbsp;<img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.15.0-brightgreen?style=for-the-badge&logo=linux">
+<img alt="GitHub release (with filter)" src="https://img.shields.io/github/v/release/naiba/nezha?color=brightgreen&style=for-the-badge&logo=github&label=Dashboard">&nbsp;<img src="https://img.shields.io/github/v/release/nezhahq/agent?color=brightgreen&label=Agent&style=for-the-badge&logo=github">&nbsp;<img src="https://img.shields.io/github/actions/workflow/status/nezhahq/agent/agent.yml?label=Agent%20CI&logo=github&style=for-the-badge">&nbsp;<img src="https://img.shields.io/badge/Installer-v0.15.2-brightgreen?style=for-the-badge&logo=linux">
   <br>
   <br>
   <p>:trollface: <b>Nezha Monitoring: Self-hostable, lightweight, servers and websites monitoring and O&M tool.</b></p>
@@ -77,6 +77,9 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/spiritLHLS" title="spiritlhl">
   <img src="https://avatars.githubusercontent.com/u/103393591?v=4" width="50;" alt="spiritlhl"/>
 </a>
+<a href="https://github.com/applexad" title="Applexad">
+  <img src="https://avatars.githubusercontent.com/u/35923940?v=4" width="50;" alt="Applexad"/>
+</a>
 <a href="https://github.com/rootmelo92118" title="rootmelo92118">
   <img src="https://avatars.githubusercontent.com/u/32770959?v=4" width="50;" alt="rootmelo92118"/>
 </a>

cmd/dashboard/controller/controller.go

@@ -43,6 +43,7 @@ func ServeWeb(port uint) *http.Server {
 		panic(err)
 	}
 	r.StaticFS("/static", http.FS(staticFs))
+	r.Static("/static-custom", "resource/static/custom")
 	routers(r)
 
 	page404 := func(c *gin.Context) {

model/alertrule.go

@@ -85,13 +85,13 @@ func (r *AlertRule) Snapshot(cycleTransferStats *CycleTransferStats, server *Ser
 
 // Check 传入包含当前报警规则下所有type检查结果的空接口 返回报警持续时间与是否通过报警检查(通过则返回true)
 func (r *AlertRule) Check(points [][]interface{}) (int, bool) {
-	var max int   // 报警持续时间
+	var maxNum int // 报警持续时间
 	var count int  // 检查未通过的个数
 	for i := 0; i < len(r.Rules); i++ {
 		if r.Rules[i].IsTransferDurationRule() {
 			// 循环区间流量报警
-			if max < 1 {
+			if maxNum < 1 {
-				max = 1
+				maxNum = 1
 			}
 			for j := len(points[i]) - 1; j >= 0; j-- {
 				if points[i][j] != nil {
@@ -104,8 +104,8 @@ func (r *AlertRule) Check(points [][]interface{}) (int, bool) {
 			total := 0.0
 			fail := 0.0
 			num := int(r.Rules[i].Duration)
-			if num > max {
+			if num > maxNum {
-				max = num
+				maxNum = num
 			}
 			if len(points) < num {
 				continue
@@ -124,5 +124,5 @@ func (r *AlertRule) Check(points [][]interface{}) (int, bool) {
 		}
 	}
 	// 仅当所有检查均未通过时 返回false
-	return max, count != len(r.Rules)
+	return maxNum, count != len(r.Rules)
 }

model/notification.go

@@ -1,7 +1,6 @@
 package model
 
 import (
-	"crypto/tls"
 	"errors"
 	"fmt"
 	"io"
@@ -117,11 +116,14 @@ func (ns *NotificationServerBundle) Send(message string) error {
 		verifySSL = true
 	}
 
-	transCfg := &http.Transport{
+	var client *http.Client
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: verifySSL},
+
+	if verifySSL {
+		client = utils.HttpClient
+	} else {
+		client = utils.HttpClientSkipTlsVerify
 	}
 
-	client := &http.Client{Transport: transCfg, Timeout: time.Minute * 10}
 	reqBody, err := ns.reqBody(message)
 	if err != nil {
 		return err
@@ -147,13 +149,15 @@ func (ns *NotificationServerBundle) Send(message string) error {
 	if err != nil {
 		return err
 	}
-
-	if resp.StatusCode < 200 || resp.StatusCode > 299 {
 	defer func() {
 		_ = resp.Body.Close()
 	}()
+
+	if resp.StatusCode < 200 || resp.StatusCode > 299 {
 		body, _ := io.ReadAll(resp.Body)
 		return fmt.Errorf("%d@%s %s", resp.StatusCode, resp.Status, string(body))
+	} else {
+		_, _ = io.Copy(io.Discard, resp.Body)
 	}
 
 	return nil

pkg/utils/http.go

@@ -0,0 +1,47 @@
+package utils
+
+import (
+	"crypto/tls"
+	"net/http"
+	"time"
+)
+
+var (
+	HttpClientSkipTlsVerify *http.Client
+	HttpClient              *http.Client
+)
+
+func init() {
+	HttpClientSkipTlsVerify = httpClient(_httpClient{
+		Transport: httpTransport(_httpTransport{
+			VerifySSL: true,
+		}),
+	})
+	HttpClient = httpClient(_httpClient{
+		Transport: httpTransport(_httpTransport{
+			VerifySSL: false,
+		}),
+	})
+}
+
+type _httpTransport struct {
+	VerifySSL bool
+}
+
+func httpTransport(conf _httpTransport) *http.Transport {
+	return &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: conf.VerifySSL},
+		Proxy:           http.ProxyFromEnvironment,
+	}
+}
+
+type _httpClient struct {
+	Transport *http.Transport
+}
+
+func httpClient(conf _httpClient) *http.Client {
+	return &http.Client{
+		Transport: conf.Transport,
+		Timeout:   time.Minute * 10,
+	}
+}

script/docker-compose.yaml

@@ -6,10 +6,9 @@ services:
     restart: always
     volumes:
       - ./data:/dashboard/data
+      - ./static-custom/static:/dashboard/resource/static/custom:ro
       - ./theme-custom/template:/dashboard/resource/template/theme-custom:ro
-      - ./theme-custom/static:/dashboard/resource/static/theme-custom:ro
       - ./dashboard-custom/template:/dashboard/resource/template/dashboard-custom:ro
-      - ./dashboard-custom/static:/dashboard/resource/static/dashboard-custom:ro
     ports:
       - nz_site_port:80
       - nz_grpc_port:nz_grpc_port

script/install.sh

@@ -11,7 +11,10 @@ NZ_BASE_PATH="/opt/nezha"
 NZ_DASHBOARD_PATH="${NZ_BASE_PATH}/dashboard"
 NZ_AGENT_PATH="${NZ_BASE_PATH}/agent"
 NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service"
-NZ_VERSION="v0.15.0"
+NZ_AGENT_SERVICERC="/etc/init.d/nezha-agent"
+NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service"
+NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard"
+NZ_VERSION="v0.15.2"
 
 red='\033[0;31m'
 green='\033[0;32m'
@@ -71,12 +74,14 @@ pre_check() {
         Get_Docker_URL="get.docker.com"
         Get_Docker_Argu=" "
         Docker_IMG="ghcr.io\/naiba\/nezha-dashboard"
+        GITHUB_RELEASE_URL="github.com/naiba/nezha/releases/latest/download"
     else
-        GITHUB_RAW_URL="jihulab.com/nezha/dashboard/-/raw/master"
+        GITHUB_RAW_URL="gitee.com/naibahq/nezha/raw/master"
         GITHUB_URL="dn-dao-github-mirror.daocloud.io"
-        Get_Docker_URL="get.daocloud.io/docker"
+        Get_Docker_URL="get.docker.com"
         Get_Docker_Argu=" -s docker --mirror Aliyun"
         Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard"
+        GITHUB_RELEASE_URL="hub.fgit.cf/naiba/nezha/releases/latest/download"
     fi
 }
 
@@ -124,6 +129,7 @@ install_base() {
     (command -v git >/dev/null 2>&1 && command -v curl >/dev/null 2>&1 && command -v wget >/dev/null 2>&1 && command -v unzip >/dev/null 2>&1 && command -v getenforce >/dev/null 2>&1) ||
     (install_soft curl wget git unzip)
 }
+
 install_arch(){
     echo -e "${green}提示: ${plain} Arch安装libselinux需添加nezha-agent用户，安装完会自动删除，建议手动检查一次\n"
     read -e -r -p "是否安装libselinux? [Y/n] " input
@@ -162,7 +168,7 @@ install_dashboard() {
     echo -e "> 安装面板"
 
     # 哪吒监控文件夹
-    if [ ! -d "${NZ_DASHBOARD_PATH}" ]; then
+    if [ ! -d "${NZ_DASHBOARD_PATH}/docker-compose.yaml" ]; then
         mkdir -p $NZ_DASHBOARD_PATH
     else
         echo "您可能已经安装过面板端，重复安装会覆盖数据，请注意备份。"
@@ -204,6 +210,45 @@ install_dashboard() {
     fi
 }
 
+install_dashboard_standalone() {
+    install_base
+    
+    echo -e "> 安装面板"
+    
+    # 哪吒监控文件夹
+    if [ ! -d "${NZ_DASHBOARD_PATH}/app" ]; then
+        mkdir -p $NZ_DASHBOARD_PATH
+    else
+        echo "您可能已经安装过面板端，重复安装会覆盖数据，请注意备份。"
+        read -e -r -p "是否退出安装? [Y/n] " input
+        case $input in
+            [yY][eE][sS] | [yY])
+                echo "退出安装"
+                exit 0
+            ;;
+            [nN][oO] | [nN])
+                echo "继续安装"
+            ;;
+            *)
+                echo "退出安装"
+                exit 0
+            ;;
+        esac
+    fi
+    
+    if [ ! -d "${NZ_DASHBOARD_PATH}/resource/template/theme-custom" ] || [ ! -d "${NZ_DASHBOARD_PATH}/resource/static/custom" ]; then
+        mkdir -p "${NZ_DASHBOARD_PATH}/resource/template/theme-custom" "${NZ_DASHBOARD_PATH}/resource/static/custom" >/dev/null 2>&1
+    fi
+
+    chmod 777 -R $NZ_DASHBOARD_PATH
+    
+    modify_dashboard_config_standalone 0
+    
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 selinux(){
     #判断当前的状态
     if [ "$os_alpine" != 1 ];then
@@ -275,6 +320,13 @@ modify_agent_config() {
             echo -e "${red}文件下载失败，请检查本机能否连接 ${GITHUB_RAW_URL}${plain}"
             return 0
         fi
+    else
+        wget -t 2 -T 10 -O $NZ_AGENT_SERVICERC https://${GITHUB_RAW_URL}/script/nezha-agent >/dev/null 2>&1
+        chmod +x $NZ_AGENT_SERVICERC
+        if [[ $? != 0 ]]; then
+            echo -e "${red}Fail to download service, please check if the network can link ${GITHUB_RAW_URL}${plain}"
+            return 0
+        fi
     fi
 
     if [ $# -lt 3 ]; then
@@ -308,8 +360,10 @@ modify_agent_config() {
         sed -i "s/nz_client_secret/${nz_client_secret}/" ${NZ_AGENT_SERVICE}
         [ -n "${args}" ] && sed -i "/ExecStart/ s/$/ ${args}/" ${NZ_AGENT_SERVICE}
     else
-        echo "@reboot ${NZ_AGENT_PATH}/nezha-agent -s ${nz_grpc_host}:${nz_grpc_port} -p ${nz_client_secret} ${args}" >> /etc/crontabs/root
+        sed -i "s/nz_grpc_host/${nz_grpc_host}/" ${NZ_AGENT_SERVICERC}
-        crond
+        sed -i "s/nz_grpc_port/${nz_grpc_port}/" ${NZ_AGENT_SERVICERC}
+        sed -i "s/nz_client_secret/${nz_client_secret}/" ${NZ_AGENT_SERVICERC}
+        [ -n "${args}" ] && sed -i "/command_args/ s/\"$/ ${args}\"/" ${NZ_AGENT_SERVICERC}
     fi
 
     echo -e "Agent配置 ${green}修改成功，请稍等重启生效${plain}"
@@ -319,12 +373,13 @@ modify_agent_config() {
         systemctl enable nezha-agent
         systemctl restart nezha-agent
     else
-        nohup ${NZ_AGENT_PATH}/nezha-agent -s ${nz_grpc_host}:${nz_grpc_port} -p ${nz_client_secret} ${args} >/dev/null 2>&1 &
+        rc-update add nezha-agent
+        rc-service nezha-agent restart
     fi
 
-    if [[ $# == 0 ]]; then
+    #if [[ $# == 0 ]]; then
-        before_show_menu
+    #    before_show_menu
-    fi
+    #fi
 }
 
 modify_dashboard_config() {
@@ -393,6 +448,78 @@ modify_dashboard_config() {
     fi
 }
 
+modify_dashboard_config_standalone() {
+    echo -e "> 修改面板配置"
+    
+    echo -e "正在下载配置模板"
+    
+    wget -t 2 -T 10 -O /tmp/nezha-config.yaml https://${GITHUB_RAW_URL}/script/config.yaml >/dev/null 2>&1
+    if [[ $? != 0 ]]; then
+        echo -e "${red}下载文件失败，请检查本机能否连接 ${GITHUB_RAW_URL}${plain}"
+        return 0
+    fi
+    
+    echo "关于 GitHub Oauth2 应用：在 https://github.com/settings/developers 创建，无需审核，Callback 填 http(s)://域名或IP/oauth2/callback" &&
+    echo "关于 Gitee Oauth2 应用：在 https://gitee.com/oauth/applications 创建，无需审核，Callback 填 http(s)://域名或IP/oauth2/callback" &&
+    read -ep "请输入 OAuth2 提供商(github/gitlab/jihulab/gitee，默认 github): " nz_oauth2_type &&
+    read -ep "请输入 Oauth2 应用的 Client ID: " nz_github_oauth_client_id &&
+    read -ep "请输入 Oauth2 应用的 Client Secret: " nz_github_oauth_client_secret &&
+    read -ep "请输入 GitHub/Gitee 登录名作为管理员，多个以逗号隔开: " nz_admin_logins &&
+    read -ep "请输入站点标题: " nz_site_title &&
+    read -ep "请输入站点访问端口: (默认 8008)" nz_site_port &&
+    read -ep "请输入用于 Agent 接入的 RPC 端口: (默认 5555)" nz_grpc_port
+    
+    if [[ -z "${nz_admin_logins}" || -z "${nz_github_oauth_client_id}" || -z "${nz_github_oauth_client_secret}" || -z "${nz_site_title}" ]]; then
+        echo -e "${red}所有选项都不能为空${plain}"
+        before_show_menu
+        return 1
+    fi
+    
+    if [[ -z "${nz_site_port}" ]]; then
+        nz_site_port=8008
+    fi
+    if [[ -z "${nz_grpc_port}" ]]; then
+        nz_grpc_port=5555
+    fi
+    if [[ -z "${nz_oauth2_type}" ]]; then
+        nz_oauth2_type=github
+    fi
+    
+    sed -i "s/nz_oauth2_type/${nz_oauth2_type}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_admin_logins/${nz_admin_logins}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_grpc_port/${nz_grpc_port}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_github_oauth_client_id/${nz_github_oauth_client_id}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_github_oauth_client_secret/${nz_github_oauth_client_secret}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_language/zh-CN/" /tmp/nezha-config.yaml
+    sed -i "s/nz_site_title/${nz_site_title}/" /tmp/nezha-config.yaml
+    sed -i "s/80/${nz_site_port}/" /tmp/nezha-config.yaml
+    
+    mkdir -p $NZ_DASHBOARD_PATH/data
+    mv -f /tmp/nezha-config.yaml ${NZ_DASHBOARD_PATH}/data/config.yaml
+
+    echo -e "正在下载服务文件"
+
+    if [ "$os_alpine" != 1 ];then
+        wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICE https://${GITHUB_RAW_URL}/script/nezha-dashboard.service >/dev/null 2>&1
+        else
+        wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICERC https://${GITHUB_RAW_URL}/script/nezha-dashboard >/dev/null 2>&1
+        chmod +x $NZ_DASHBOARD_SERVICERC
+        if [[ $? != 0 ]]; then
+            echo -e "${red}文件下载失败，请检查本机能否连接 ${GITHUB_RAW_URL}${plain}"
+            return 0
+        fi
+    fi
+
+    
+    echo -e "面板配置 ${green}修改成功，请稍等重启生效${plain}"
+    
+    restart_and_update_standalone
+    
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 restart_and_update() {
     echo -e "> 重启并更新面板"
 
@@ -421,6 +548,40 @@ restart_and_update() {
     fi
 }
 
+restart_and_update_standalone() {
+    echo -e "> 重启并更新面板"
+    
+    cd $NZ_DASHBOARD_PATH
+
+    if [ "$os_alpine" != 1 ]; then
+        systemctl stop nezha-dashboard
+    else
+        rc-service nezha-dashboard stop
+    fi
+
+    wget -qO app.zip $GITHUB_RELEASE_URL/dashboard-linux-$os_arch.zip >/dev/null 2>&1 && unzip -qq app.zip && mv dist/dashboard-linux-$os_arch app && rm -r app.zip dist
+
+    if [ "$os_alpine" != 1 ];then
+        systemctl daemon-reload
+        systemctl enable nezha-dashboard
+        systemctl restart nezha-dashboard
+    else
+        rc-update add nezha-dashboard
+        rc-service nezha-dashboard restart
+    fi
+    
+    if [[ $? == 0 ]]; then
+        echo -e "${green}哪吒监控 重启成功${plain}"
+        echo -e "默认管理面板地址：${yellow}域名:站点访问端口${plain}"
+    else
+        echo -e "${red}重启失败，可能是因为启动时间超过了两秒，请稍后查看日志信息${plain}"
+    fi
+    
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 start_dashboard() {
     echo -e "> 启动面板"
 
@@ -442,6 +603,26 @@ start_dashboard() {
     fi
 }
 
+start_dashboard_standalone() {
+    echo -e "> 启动面板"
+    
+    if [ "$os_alpine" != 1 ]; then
+        systemctl start nezha-dashboard
+    else
+        rc-service nezha-dashboard start
+    fi
+    
+    if [[ $? == 0 ]]; then
+        echo -e "${green}哪吒监控 启动成功${plain}"
+    else
+        echo -e "${red}启动失败，请稍后查看日志信息${plain}"
+    fi
+    
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 stop_dashboard() {
     echo -e "> 停止面板"
 
@@ -463,6 +644,26 @@ stop_dashboard() {
     fi
 }
 
+stop_dashboard_standalone() {
+    echo -e "> 停止面板"
+    
+    if [ "$os_alpine" != 1 ]; then
+        systemctl stop nezha-dashboard
+    else
+        rc-service nezha-dashboard stop
+    fi
+    
+    if [[ $? == 0 ]]; then
+        echo -e "${green}哪吒监控 停止成功${plain}"
+    else
+        echo -e "${red}停止失败，请稍后查看日志信息${plain}"
+    fi
+    
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 show_dashboard_log() {
     echo -e "> 获取面板日志"
 
@@ -478,6 +679,20 @@ show_dashboard_log() {
     fi
 }
 
+show_dashboard_log_standalone() {
+    echo -e "> 获取面板日志"
+    
+    if [ "$os_alpine" != 1 ]; then
+        journalctl -xf -u nezha-dashboard.service
+    else
+        echo "很抱歉，OpenRC 无此功能"
+    fi
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 uninstall_dashboard() {
     echo -e "> 卸载管理面板"
 
@@ -498,10 +713,38 @@ uninstall_dashboard() {
     fi
 }
 
+uninstall_dashboard_standalone() {
+    echo -e "> 卸载管理面板"
+    
+    rm -rf $NZ_DASHBOARD_PATH
+
+    if [ "$os_alpine" != 1 ]; then
+        systemctl stop nezha-dashboard
+    else
+        rc-service nezha-dashboard stop
+    fi
+
+    if [ "$os_alpine" != 1 ]; then
+        rm $NZ_DASHBOARD_SERVICE
+    else
+        rm $NZ_DASHBOARD_SERVICERC
+    fi
+
+    clean_all
+    
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 show_agent_log() {
     echo -e "> 获取Agent日志"
 
+    if [ "$os_alpine" != 1 ]; then
         journalctl -xf -u nezha-agent.service
+    else
+        echo "很抱歉，OpenRC 无此功能"
+    fi
 
     if [[ $# == 0 ]]; then
         before_show_menu
@@ -517,8 +760,9 @@ uninstall_agent() {
         rm -rf $NZ_AGENT_SERVICE
         systemctl daemon-reload
     else
-        grep -q 'nezha-agent' /var/spool/cron/crontabs/root && sed -i "/nezha-agent/d" /var/spool/cron/crontabs/root
+        rc-update del nezha-agent
-        pkill nezha-agent
+        rc-service nezha-agent stop
+        rm -rf $NZ_AGENT_SERVICERC
     fi
 
     rm -rf $NZ_AGENT_PATH
@@ -532,7 +776,11 @@ uninstall_agent() {
 restart_agent() {
     echo -e "> 重启Agent"
 
+    if [ "$os_alpine" != 1 ];then
         systemctl restart nezha-agent.service
+    else
+        rc-service nezha-agent restart
+    fi
 
     if [[ $# == 0 ]]; then
         before_show_menu
@@ -545,6 +793,35 @@ clean_all() {
     fi
 }
 
+select_version() {
+    if command -v docker compose >/dev/null 2>&1; then
+        if docker compose ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+            IS_DOCKER_NEZHA=1
+        fi
+    fi
+    if [[ -f $NZ_DASHBOARD_PATH/app ]]; then
+        IS_DOCKER_NEZHA=0
+    else
+        echo -e "${yellow}请自行选择您的安装方式（如果你是安装Agent，输入哪个都是一样的）：\n1. Docker\n2. 独立安装${plain}"
+        while true; do
+            read -e -r -p "请输入数字 [1-2]：" option
+            case "${option}" in
+                1)
+                    IS_DOCKER_NEZHA=1
+                    break
+                ;;
+                2)
+                    IS_DOCKER_NEZHA=0
+                    break
+                ;;
+                *)
+                    echo "输入有误，请重新输入"
+                ;;
+            esac
+        done
+    fi
+}
+
 show_usage() {
     echo "哪吒监控 管理脚本使用方法: "
     echo "--------------------------------------------------------"
@@ -589,7 +866,7 @@ show_menu() {
     ${green}0.${plain}  退出脚本
     "
     echo && read -ep "请输入选择 [0-13]: " num
-
+    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
         case "${num}" in
             0)
                 exit 0
@@ -637,11 +914,63 @@ show_menu() {
                 echo -e "${red}请输入正确的数字 [0-13]${plain}"
             ;;
         esac
+    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        case "${num}" in
+            0)
+                exit 0
+            ;;
+            1)
+                install_dashboard_standalone
+            ;;
+            2)
+                modify_dashboard_config_standalone
+            ;;
+            3)
+                start_dashboard_standalone
+            ;;
+            4)
+                stop_dashboard_standalone
+            ;;
+            5)
+                restart_and_update_standalone
+            ;;
+            6)
+                show_dashboard_log_standalone
+            ;;
+            7)
+                uninstall_dashboard_standalone
+            ;;
+            8)
+                install_agent
+            ;;
+            9)
+                modify_agent_config
+            ;;
+            10)
+                show_agent_log
+            ;;
+            11)
+                uninstall_agent
+            ;;
+            12)
+                restart_agent
+            ;;
+            13)
+                update_script
+            ;;
+            *)
+                echo -e "${red}请输入正确的数字 [0-13]${plain}"
+            ;;
+        esac
+    else
+        select_version
+    fi
 }
 
 pre_check
 
 if [[ $# > 0 ]]; then
+    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
         case $1 in
             "install_dashboard")
                 install_dashboard 0
@@ -689,6 +1018,83 @@ if [[ $# > 0 ]]; then
             ;;
             *) show_usage ;;
         esac
+    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        case $1 in
+            "install_dashboard")
+                install_dashboard_standalone 0
+            ;;
+            "modify_dashboard_config")
+                modify_dashboard_config_standalone 0
+            ;;
+            "start_dashboard")
+                start_dashboard_standalone 0
+            ;;
+            "stop_dashboard")
+                stop_dashboard_standalone 0
+            ;;
+            "restart_and_update")
+                restart_and_update_standalone 0
+            ;;
+            "show_dashboard_log")
+                show_dashboard_log_standalone 0
+            ;;
+            "uninstall_dashboard")
+                uninstall_dashboard_standalone 0
+            ;;
+            "install_agent")
+                shift
+                if [ $# -ge 3 ]; then
+                    install_agent "$@"
+                else
+                    install_agent 0
+                fi
+            ;;
+            "modify_agent_config")
+                modify_agent_config 0
+            ;;
+            "show_agent_log")
+                show_agent_log 0
+            ;;
+            "uninstall_agent")
+                uninstall_agent 0
+            ;;
+            "restart_agent")
+                restart_agent 0
+            ;;
+            "update_script")
+                update_script 0
+            ;;
+            *) show_usage ;;
+        esac
+    else
+        case $1 in
+            "install_agent")
+                shift
+                if [ $# -ge 3 ]; then
+                    install_agent "$@"
+                else
+                    install_agent 0
+                fi
+            ;;
+            "modify_agent_config")
+                modify_agent_config 0
+            ;;
+            "show_agent_log")
+                show_agent_log 0
+            ;;
+            "uninstall_agent")
+                uninstall_agent 0
+            ;;
+            "restart_agent")
+                restart_agent 0
+            ;;
+            "update_script")
+                update_script 0
+            ;;
+            *) show_usage ;;
+        esac
+    fi
 else
+    select_version
     show_menu
 fi

script/install_en.sh

@@ -11,7 +11,10 @@ NZ_BASE_PATH="/opt/nezha"
 NZ_DASHBOARD_PATH="${NZ_BASE_PATH}/dashboard"
 NZ_AGENT_PATH="${NZ_BASE_PATH}/agent"
 NZ_AGENT_SERVICE="/etc/systemd/system/nezha-agent.service"
-NZ_VERSION="v0.15.0"
+NZ_AGENT_SERVICERC="/etc/init.d/nezha-agent"
+NZ_DASHBOARD_SERVICE="/etc/systemd/system/nezha-dashboard.service"
+NZ_DASHBOARD_SERVICERC="/etc/init.d/nezha-dashboard"
+NZ_VERSION="v0.15.2"
 
 red='\033[0;31m'
 green='\033[0;32m'
@@ -70,18 +73,20 @@ pre_check() {
         Get_Docker_URL="get.docker.com"
         Get_Docker_Argu=" "
         Docker_IMG="ghcr.io\/naiba\/nezha-dashboard"
+        GITHUB_RELEASE_URL="github.com/naiba/nezha/releases/latest/download"
     else
-        GITHUB_RAW_URL="jihulab.com/nezha/dashboard/-/raw/master"
+        GITHUB_RAW_URL="gitee.com/naibahq/nezha/raw/master"
         GITHUB_URL="dn-dao-github-mirror.daocloud.io"
-        Get_Docker_URL="get.daocloud.io/docker"
+        Get_Docker_URL="get.docker.com"
         Get_Docker_Argu=" -s docker --mirror Aliyun"
         Docker_IMG="registry.cn-shanghai.aliyuncs.com\/naibahq\/nezha-dashboard"
+        GITHUB_RELEASE_URL="hub.fgit.cf/naiba/nezha/releases/latest/download"
     fi
 }
 
 confirm() {
     if [[ $# > 1 ]]; then
-        echo && read -e -p "$1 [Default$2]: " temp
+        echo && read -e -p "$1 [默认$2]: " temp
         if [[ x"${temp}" == x"" ]]; then
             temp=$2
         fi
@@ -101,7 +106,7 @@ update_script() {
     curl -sL https://${GITHUB_RAW_URL}/script/install_en.sh -o /tmp/nezha.sh
     new_version=$(cat /tmp/nezha.sh | grep "NZ_VERSION" | head -n 1 | awk -F "=" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
     if [ ! -n "$new_version" ]; then
-        echo -e "Script failed to get, please check if the network can link https://${GITHUB_RAW_URL}/script/install_en.sh"
+        echo -e "Script failed to get, please check if the network can link https://${GITHUB_RAW_URL}/script/install.sh"
         return 1
     fi
     echo -e "The current latest version is: ${new_version}"
@@ -121,8 +126,9 @@ before_show_menu() {
 
 install_base() {
     (command -v git >/dev/null 2>&1 && command -v curl >/dev/null 2>&1 && command -v wget >/dev/null 2>&1 && command -v unzip >/dev/null 2>&1 && command -v getenforce >/dev/null 2>&1) ||
-    (install_soft curl wget git unzip)
+    (install_soft curl wget git unzip tzdata)
 }
+
 install_arch(){
     echo -e "${green}Info: ${plain} Archlinux needs to add nezha-agent user to install libselinux. It will be deleted automatically after installation. It is recommended to check manually\n"
     read -e -r -p "Do you need to install libselinux? [Y/n] " input
@@ -147,7 +153,6 @@ install_arch(){
     esac
 }
 
-
 install_soft() {
     (command -v yum >/dev/null 2>&1 && yum makecache && yum install $* selinux-policy -y) ||
     (command -v apt >/dev/null 2>&1 && apt update && apt install $* selinux-utils -y) ||
@@ -162,7 +167,7 @@ install_dashboard() {
     echo -e "> Install Panel"
 
     # Nezha Monitoring Folder
-    if [ ! -d "${NZ_DASHBOARD_PATH}" ]; then
+    if [ ! -d "${NZ_DASHBOARD_PATH}/docker-compose.yaml" ]; then
         mkdir -p $NZ_DASHBOARD_PATH
     else
         echo "You may have already installed the dashboard, repeated installation will overwrite the data, please pay attention to backup."
@@ -203,6 +208,45 @@ install_dashboard() {
     fi
 }
 
+install_dashboard_standalone() {
+    install_base
+    
+    echo -e "> Install Panel"
+    
+    # Nezha Monitoring Folder
+    if [ ! -d "${NZ_DASHBOARD_PATH}/app" ]; then
+        mkdir -p $NZ_DASHBOARD_PATH
+    else
+        echo "You may have already installed the dashboard, repeated installation will overwrite the data, please pay attention to backup."
+        read -e -r -p "Exit the installation? [Y/n] " input
+        case $input in
+            [yY][eE][sS] | [yY])
+                echo "Exit the installation."
+                exit 0
+            ;;
+            [nN][oO] | [nN])
+                echo "Continue."
+            ;;
+            *)
+                echo "Exit the installation."
+                exit 0
+            ;;
+        esac
+    fi
+
+    if [ ! -d "${NZ_DASHBOARD_PATH}/resource/template/theme-custom" ] || [ ! -d "${NZ_DASHBOARD_PATH}/resource/static/custom" ]; then
+        mkdir -p "${NZ_DASHBOARD_PATH}/resource/template/theme-custom" "${NZ_DASHBOARD_PATH}/resource/static/custom" >/dev/null 2>&1
+    fi
+
+    chmod 777 -R $NZ_DASHBOARD_PATH
+    
+    modify_dashboard_config_standalone 0
+    
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 selinux(){
     #Check SELinux
     if [ "$os_alpine" != 1 ];then
@@ -274,6 +318,13 @@ modify_agent_config() {
             echo -e "${red}Fail to download service, please check if the network can link ${GITHUB_RAW_URL}${plain}"
             return 0
         fi
+    else
+        wget -t 2 -T 10 -O $NZ_AGENT_SERVICERC https://${GITHUB_RAW_URL}/script/nezha-agent >/dev/null 2>&1
+        chmod +x $NZ_AGENT_SERVICERC
+        if [[ $? != 0 ]]; then
+            echo -e "${red}Fail to download service, please check if the network can link ${GITHUB_RAW_URL}${plain}"
+            return 0
+        fi
     fi
 
     if [ $# -lt 3 ]; then
@@ -307,8 +358,10 @@ modify_agent_config() {
         sed -i "s/nz_client_secret/${nz_client_secret}/" ${NZ_AGENT_SERVICE}
         [ -n "${args}" ] && sed -i "/ExecStart/ s/$/ ${args}/" ${NZ_AGENT_SERVICE}
     else
-        echo "@reboot ${NZ_AGENT_PATH}/nezha-agent -s ${nz_grpc_host}:${nz_grpc_port} -p ${nz_client_secret} ${args}" >> /etc/crontabs/root
+        sed -i "s/nz_grpc_host/${nz_grpc_host}/" ${NZ_AGENT_SERVICERC}
-        crond
+        sed -i "s/nz_grpc_port/${nz_grpc_port}/" ${NZ_AGENT_SERVICERC}
+        sed -i "s/nz_client_secret/${nz_client_secret}/" ${NZ_AGENT_SERVICERC}
+        [ -n "${args}" ] && sed -i "/command_args/ s/\"$/ ${args}\"/" ${NZ_AGENT_SERVICERC}
     fi
 
     echo -e "Agent configuration ${green} modified successfully, please wait for agent self-restart to take effect${plain}"
@@ -318,12 +371,13 @@ modify_agent_config() {
         systemctl enable nezha-agent
         systemctl restart nezha-agent
     else
-        nohup ${NZ_AGENT_PATH}/nezha-agent -s ${nz_grpc_host}:${nz_grpc_port} -p ${nz_client_secret} ${args} >/dev/null 2>&1 &
+        rc-update add nezha-agent
+        rc-service nezha-agent restart
     fi
 
-    if [[ $# == 0 ]]; then
+    #if [[ $# == 0 ]]; then
-        before_show_menu
+    #    before_show_menu
-    fi
+    #fi
 }
 
 modify_dashboard_config() {
@@ -392,6 +446,78 @@ modify_dashboard_config() {
     fi
 }
 
+modify_dashboard_config_standalone() {
+    echo -e "> Modify Panel Configuration"
+    
+    echo -e "Download configuration template"
+    
+    wget -t 2 -T 10 -O /tmp/nezha-config.yaml https://${GITHUB_RAW_URL}/script/config.yaml >/dev/null 2>&1
+    if [[ $? != 0 ]]; then
+        echo -e "${red}File failed to get, please check if the network can link ${GITHUB_RAW_URL}${plain}"
+        return 0
+    fi
+    
+    echo "About the GitHub Oauth2 application: create it at https://github.com/settings/developers, no review required, and fill in the http(s)://domain_or_IP/oauth2/callback" &&
+    echo "(Not recommended) About the Gitee Oauth2 application: create it at https://gitee.com/oauth/applications, no auditing required, and fill in the http(s)://domain_or_IP/oauth2/callback" &&
+    read -ep "Please enter the OAuth2 provider (github/gitlab/jihulab/gitee, default github): " nz_oauth2_type &&
+    read -ep "Please enter the Client ID of the Oauth2 application: " nz_github_oauth_client_id &&
+    read -ep "Please enter the Client Secret of the Oauth2 application: " nz_github_oauth_client_secret &&
+    read -ep "Please enter your GitHub/Gitee login name as the administrator, separated by commas: " nz_admin_logins &&
+    read -ep "Please enter the site title: " nz_site_title &&
+    read -ep "Please enter the site access port: (default 8008)" nz_site_port &&
+    read -ep "Please enter the RPC port to be used for Agent access: (default 5555)" nz_grpc_port
+    
+    if [[ -z "${nz_admin_logins}" || -z "${nz_github_oauth_client_id}" || -z "${nz_github_oauth_client_secret}" || -z "${nz_site_title}" ]]; then
+        echo -e "${red}All options cannot be empty${plain}"
+        before_show_menu
+        return 1
+    fi
+    
+    if [[ -z "${nz_site_port}" ]]; then
+        nz_site_port=8008
+    fi
+    if [[ -z "${nz_grpc_port}" ]]; then
+        nz_grpc_port=5555
+    fi
+    if [[ -z "${nz_oauth2_type}" ]]; then
+        nz_oauth2_type=github
+    fi
+    
+    sed -i "s/nz_oauth2_type/${nz_oauth2_type}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_admin_logins/${nz_admin_logins}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_grpc_port/${nz_grpc_port}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_github_oauth_client_id/${nz_github_oauth_client_id}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_github_oauth_client_secret/${nz_github_oauth_client_secret}/" /tmp/nezha-config.yaml
+    sed -i "s/nz_language/zh-CN/" /tmp/nezha-config.yaml
+    sed -i "s/nz_site_title/${nz_site_title}/" /tmp/nezha-config.yaml
+    sed -i "s/80/${nz_site_port}/" /tmp/nezha-config.yaml
+    
+    mkdir -p $NZ_DASHBOARD_PATH/data
+    mv -f /tmp/nezha-config.yaml ${NZ_DASHBOARD_PATH}/data/config.yaml
+
+    echo -e "Downloading service file"
+
+    if [ "$os_alpine" != 1 ];then
+        wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICE https://${GITHUB_RAW_URL}/script/nezha-dashboard.service >/dev/null 2>&1
+        else
+        wget -t 2 -T 10 -O $NZ_DASHBOARD_SERVICERC https://${GITHUB_RAW_URL}/script/nezha-dashboard >/dev/null 2>&1
+        chmod +x $NZ_DASHBOARD_SERVICERC
+        if [[ $? != 0 ]]; then
+            echo -e "${red}File failed to get, please check if the network can link ${GITHUB_RAW_URL}${plain}"
+            return 0
+        fi
+    fi
+
+    
+    echo -e "Dashboard configuration ${green} modified successfully, please wait for Dashboard self-restart to take effect${plain}"
+    
+    restart_and_update_standalone
+    
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 restart_and_update() {
     echo -e "> Restart and Update the Panel"
 
@@ -420,6 +546,40 @@ restart_and_update() {
     fi
 }
 
+restart_and_update_standalone() {
+    echo -e "> Restart and Update the Panel"
+    
+    cd $NZ_DASHBOARD_PATH
+
+    if [ "$os_alpine" != 1 ]; then
+        systemctl stop nezha-dashboard
+    else
+        rc-service nezha-dashboard stop
+    fi
+
+    wget -qO app.zip $GITHUB_RELEASE_URL/dashboard-linux-$os_arch.zip >/dev/null 2>&1 && unzip -qq app.zip && mv dist/dashboard-linux-$os_arch app && rm -r app.zip dist
+
+    if [ "$os_alpine" != 1 ];then
+        systemctl daemon-reload
+        systemctl enable nezha-dashboard
+        systemctl restart nezha-dashboard
+    else
+        rc-update add nezha-dashboard
+        rc-service nezha-dashboard restart
+    fi
+    
+    if [[ $? == 0 ]]; then
+        echo -e "${green}Nezha Monitoring Restart Successful${plain}"
+        echo -e "Default panel address: ${yellow}domain:Site_access_port${plain}"
+    else
+        echo -e "${red}The restart failed, probably because the boot time exceeded two seconds, please check the log information later${plain}"
+    fi
+    
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 start_dashboard() {
     echo -e "> Start Panel"
 
@@ -441,6 +601,26 @@ start_dashboard() {
     fi
 }
 
+start_dashboard_standalone() {
+    echo -e "> Start Panel"
+    
+    if [ "$os_alpine" != 1 ]; then
+        systemctl start nezha-dashboard
+    else
+        rc-service nezha-dashboard start
+    fi
+    
+    if [[ $? == 0 ]]; then
+        echo -e "${green}Nezha Monitoring Start Successful${plain}"
+    else
+        echo -e "${red}Failed to start, please check the log message later${plain}"
+    fi
+    
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 stop_dashboard() {
     echo -e "> Stop Panel"
 
@@ -462,6 +642,26 @@ stop_dashboard() {
     fi
 }
 
+stop_dashboard_standalone() {
+    echo -e "> Stop Panel"
+    
+    if [ "$os_alpine" != 1 ]; then
+        systemctl stop nezha-dashboard
+    else
+        rc-service nezha-dashboard stop
+    fi
+    
+    if [[ $? == 0 ]]; then
+        echo -e "${green}Nezha Monitoring Stop Successful${plain}"
+    else
+        echo -e "${red}Failed to stop, please check the log message later${plain}"
+    fi
+    
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 show_dashboard_log() {
     echo -e "> View Panel Log"
 
@@ -477,6 +677,20 @@ show_dashboard_log() {
     fi
 }
 
+show_dashboard_log_standalone() {
+    echo -e "> View Panel Log"
+    
+    if [ "$os_alpine" != 1 ]; then
+        journalctl -xf -u nezha-dashboard.service
+    else
+        echo "Sorry, OpenRC do not have this feature yet."
+    fi
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
 uninstall_dashboard() {
     echo -e "> Uninstall Panel"
 
@@ -489,6 +703,31 @@ uninstall_dashboard() {
 
     rm -rf $NZ_DASHBOARD_PATH
     docker rmi -f ghcr.io/naiba/nezha-dashboard > /dev/null 2>&1
+    docker rmi -f registry.cn-shanghai.aliyuncs.com/naibahq/nezha-dashboard > /dev/null 2>&1
+    clean_all
+
+    if [[ $# == 0 ]]; then
+        before_show_menu
+    fi
+}
+
+uninstall_dashboard_standalone() {
+    echo -e "> Uninstall Panel"
+    
+    rm -rf $NZ_DASHBOARD_PATH
+
+    if [ "$os_alpine" != 1 ]; then
+        systemctl stop nezha-dashboard
+    else
+        rc-service nezha-dashboard stop
+    fi
+
+    if [ "$os_alpine" != 1 ]; then
+        rm $NZ_DASHBOARD_SERVICE
+    else
+        rm $NZ_DASHBOARD_SERVICERC
+    fi
+
     clean_all
     
     if [[ $# == 0 ]]; then
@@ -497,9 +736,13 @@ uninstall_dashboard() {
 }
 
 show_agent_log() {
-    echo -e "> View Agent Log"
+    echo -e "> > View Agent Log"
 
+    if [ "$os_alpine" != 1 ]; then
         journalctl -xf -u nezha-agent.service
+    else
+        echo "Sorry, OpenRC do not have this feature yet."
+    fi
 
     if [[ $# == 0 ]]; then
         before_show_menu
@@ -515,8 +758,9 @@ uninstall_agent() {
         rm -rf $NZ_AGENT_SERVICE
         systemctl daemon-reload
     else
-        grep -q 'nezha-agent' /var/spool/cron/crontabs/root && sed -i "/nezha-agent/d" /var/spool/cron/crontabs/root
+        rc-update del nezha-agent
-        pkill nezha-agent
+        rc-service nezha-agent stop
+        rm -rf $NZ_AGENT_SERVICERC
     fi
 
     rm -rf $NZ_AGENT_PATH
@@ -530,7 +774,11 @@ uninstall_agent() {
 restart_agent() {
     echo -e "> Restart Agent"
 
+    if [ "$os_alpine" != 1 ];then
         systemctl restart nezha-agent.service
+    else
+        rc-service nezha-agent restart
+    fi
 
     if [[ $# == 0 ]]; then
         before_show_menu
@@ -543,6 +791,35 @@ clean_all() {
     fi
 }
 
+select_version() {
+    if command -v docker compose >/dev/null 2>&1; then
+        if docker compose ls | grep -qw "$NZ_DASHBOARD_PATH/docker-compose.yaml" >/dev/null 2>&1; then
+            IS_DOCKER_NEZHA=1
+        fi
+    fi
+    if [[ -f $NZ_DASHBOARD_PATH/app ]]; then
+        IS_DOCKER_NEZHA=0
+    else
+        echo -e "${yellow}Select your installation method(Input anything is ok if you are installing agent):\n1. Docker\n2. Standalone${plain}"
+        while true; do
+            read -e -r -p "Input a number [1-2]: " option
+            case "${option}" in
+                1)
+                    IS_DOCKER_NEZHA=1
+                    break
+                ;;
+                2)
+                    IS_DOCKER_NEZHA=0
+                    break
+                ;;
+                *)
+                    echo "Wrong input, try again"
+                ;;
+            esac
+        done
+    fi
+}
+
 show_usage() {
     echo "Nezha Monitor Management Script Usage: "
     echo "--------------------------------------------------------"
@@ -587,7 +864,7 @@ show_menu() {
     ${green}0.${plain}  Exit Script
     "
     echo && read -ep "Please enter [0-13]: " num
-
+    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
         case "${num}" in
             0)
                 exit 0
@@ -635,11 +912,61 @@ show_menu() {
                 echo -e "${red}Please enter the correct number [0-13]${plain}"
             ;;
         esac
+    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        case "${num}" in
+            0)
+                exit 0
+            ;;
+            1)
+                install_dashboard_standalone
+            ;;
+            2)
+                modify_dashboard_config_standalone
+            ;;
+            3)
+                start_dashboard_standalone
+            ;;
+            4)
+                stop_dashboard_standalone
+            ;;
+            5)
+                restart_and_update_standalone
+            ;;
+            6)
+                show_dashboard_log_standalone
+            ;;
+            7)
+                uninstall_dashboard_standalone
+            ;;
+            8)
+                install_agent
+            ;;
+            9)
+                modify_agent_config
+            ;;
+            10)
+                show_agent_log
+            ;;
+            11)
+                uninstall_agent
+            ;;
+            12)
+                restart_agent
+            ;;
+            13)
+                update_script
+            ;;
+            *)
+                echo -e "${red}Please enter the correct number [0-13]${plain}"
+            ;;
+        esac
+    fi
 }
 
 pre_check
 
 if [[ $# > 0 ]]; then
+    if [[ $IS_DOCKER_NEZHA == 1 ]]; then
         case $1 in
             "install_dashboard")
                 install_dashboard 0
@@ -687,6 +1014,83 @@ if [[ $# > 0 ]]; then
             ;;
             *) show_usage ;;
         esac
+    elif [[ $IS_DOCKER_NEZHA == 0 ]]; then
+        case $1 in
+            "install_dashboard")
+                install_dashboard_standalone 0
+            ;;
+            "modify_dashboard_config")
+                modify_dashboard_config_standalone 0
+            ;;
+            "start_dashboard")
+                start_dashboard_standalone 0
+            ;;
+            "stop_dashboard")
+                stop_dashboard_standalone 0
+            ;;
+            "restart_and_update")
+                restart_and_update_standalone 0
+            ;;
+            "show_dashboard_log")
+                show_dashboard_log_standalone 0
+            ;;
+            "uninstall_dashboard")
+                uninstall_dashboard_standalone 0
+            ;;
+            "install_agent")
+                shift
+                if [ $# -ge 3 ]; then
+                    install_agent "$@"
+                else
+                    install_agent 0
+                fi
+            ;;
+            "modify_agent_config")
+                modify_agent_config 0
+            ;;
+            "show_agent_log")
+                show_agent_log 0
+            ;;
+            "uninstall_agent")
+                uninstall_agent 0
+            ;;
+            "restart_agent")
+                restart_agent 0
+            ;;
+            "update_script")
+                update_script 0
+            ;;
+            *) show_usage ;;
+        esac
+    else
+        case $1 in
+            "install_agent")
+                shift
+                if [ $# -ge 3 ]; then
+                    install_agent "$@"
+                else
+                    install_agent 0
+                fi
+            ;;
+            "modify_agent_config")
+                modify_agent_config 0
+            ;;
+            "show_agent_log")
+                show_agent_log 0
+            ;;
+            "uninstall_agent")
+                uninstall_agent 0
+            ;;
+            "restart_agent")
+                restart_agent 0
+            ;;
+            "update_script")
+                update_script 0
+            ;;
+            *) show_usage ;;
+        esac
+    fi
 else
+    select_version
     show_menu
 fi

script/nezha-agent

@@ -0,0 +1,59 @@
+#!/sbin/openrc-run
+SERVER="nz_grpc_host:nz_grpc_port" #Dashboard 地址 ip:port
+SECRET="nz_client_secret" #SECRET
+NZ_BASE_PATH="/opt/nezha"
+NZ_AGENT_PATH="${NZ_BASE_PATH}/agent"
+pidfile="/run/${RC_SVCNAME}.pid"
+command="/opt/nezha/agent/nezha-agent"
+command_args="-s ${SERVER} -p ${SECRET}"
+command_background=true
+depend() {
+	need net
+}
+checkconfig() {
+	GITHUB_URL="github.com"
+	if [ ! -f "${NZ_AGENT_PATH}/nezha-agent" ]; then
+		if [[ $(uname -m | grep 'x86_64') != "" ]]; then
+			os_arch="amd64"
+		elif [[ $(uname -m | grep 'i386\|i686') != "" ]]; then
+			os_arch="386"
+		elif [[ $(uname -m | grep 'aarch64\|armv8b\|armv8l') != "" ]]; then
+			os_arch="arm64"
+		elif [[ $(uname -m | grep 'arm') != "" ]]; then
+			os_arch="arm"
+		elif [[ $(uname -m | grep 's390x') != "" ]]; then
+			os_arch="s390x"
+		elif [[ $(uname -m | grep 'riscv64') != "" ]]; then
+			os_arch="riscv64"
+		fi
+		local version=$(curl -m 10 -sL "https://api.github.com/repos/nezhahq/agent/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+		if [ ! -n "$version" ]; then
+			version=$(curl -m 10 -sL "https://fastly.jsdelivr.net/gh/nezhahq/agent/" | grep "option\.value" | awk -F "'" '{print $2}' | sed 's/nezhahq\/agent@/v/g')
+		fi
+		if [ ! -n "$version" ]; then
+			version=$(curl -m 10 -sL "https://gcore.jsdelivr.net/gh/nezhahq/agent/" | grep "option\.value" | awk -F "'" '{print $2}' | sed 's/nezhahq\/agent@/v/g')
+		fi
+		if [ ! -n "$version" ]; then
+			echo -e "获取版本号失败，请检查本机能否链接 https://api.github.com/repos/nezhahq/agent/releases/latest"
+			return 0
+		else
+			echo -e "当前最新版本为: ${version}"
+		fi
+		wget -t 2 -T 10 -O nezha-agent_linux_${os_arch}.zip https://${GITHUB_URL}/nezhahq/agent/releases/download/${version}/nezha-agent_linux_${os_arch}.zip >/dev/null 2>&1
+		if [[ $? != 0 ]]; then
+			echo -e "Release 下载失败，请检查本机能否连接 ${GITHUB_URL}${plain}"
+			return 0
+		fi
+		mkdir -p $NZ_AGENT_PATH
+		chmod 755 -R $NZ_AGENT_PATH
+		unzip -qo nezha-agent_linux_${os_arch}.zip && mv nezha-agent $NZ_AGENT_PATH && rm -rf nezha-agent_linux_${os_arch}.zip README.md
+	fi
+	if [ ! -x "${NZ_AGENT_PATH}/nezha-agent" ]; then
+		chmod +x ${NZ_AGENT_PATH}/nezha-agent
+	fi
+}
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		checkconfig || return $?
+	fi
+}

script/nezha-dashboard

@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+pidfile="/run/${RC_SVCNAME}.pid"
+command="/opt/nezha/dashboard/app"
+command_args=""
+command_background=true
+directory="/opt/nezha/dashboard"
+
+depend() {
+	need net
+}
+
+reload() {
+  ebegin "Reloading ${RC_SVCNAME}"
+  start-stop-daemon --signal HUP --pidfile "${pidfile}"
+  eend $?
+}

script/nezha-dashboard.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Nezha Dashborad
+Description=Nezha Dashboard
 After=syslog.target
 After=network.target
 After=mariadb.service mysqld.service postgresql.service memcached.service redis.service
@@ -14,8 +14,8 @@ After=mariadb.service mysqld.service postgresql.service memcached.service redis.
 Type=simple
 #User=root
 #Group=root
-WorkingDirectory=/root/nezha/dashboard/
+WorkingDirectory=/opt/nezha/dashboard/
-ExecStart=/root/nezha/dashboard/nezha-dashboard-linux-amd64
+ExecStart=/opt/nezha/dashboard/app
 Restart=always
 #Environment=DEBUG=true