From d3f4ea43db8a1967aa196a2f6123136597064f3d Mon Sep 17 00:00:00 2001
From: pooneyy <85266337+pooneyy@users.noreply.github.com>
Date: Fri, 19 Dec 2025 03:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(nezha-agent):=20upgrade=20to?=
 =?UTF-8?q?=20version=201.14.1=20and=20restructure=20app=20versioning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- add new version 1.14.1 with updated docker image (kanggle/nezha-agent:v1.14.1)
- add new configuration option for command execution (DISABLE_COMMAND_EXECUTE)
- update docker-compose to use environment variables instead of command flags
- remove legacy version 1.1.4 and 'latest' symlink directories
- update README by removing specific TLS troubleshooting note
---
 apps/nezha-agent/1.1.4/.env.sample         |  3 --
 apps/nezha-agent/1.1.4/data.yml            | 22 ---------
 apps/nezha-agent/1.1.4/docker-compose.yml  | 11 -----
 apps/nezha-agent/1.14.1/data.yml           | 52 ++++++++++++++++++++++
 apps/nezha-agent/1.14.1/docker-compose.yml | 15 +++++++
 apps/nezha-agent/README.md                 | 20 +++------
 apps/nezha-agent/data.yml                  |  4 +-
 apps/nezha-agent/latest/.env.sample        |  3 --
 apps/nezha-agent/latest/data.yml           | 22 ---------
 apps/nezha-agent/latest/docker-compose.yml | 12 -----
 10 files changed, 76 insertions(+), 88 deletions(-)
 delete mode 100644 apps/nezha-agent/1.1.4/.env.sample
 delete mode 100644 apps/nezha-agent/1.1.4/data.yml
 delete mode 100644 apps/nezha-agent/1.1.4/docker-compose.yml
 create mode 100644 apps/nezha-agent/1.14.1/data.yml
 create mode 100644 apps/nezha-agent/1.14.1/docker-compose.yml
 delete mode 100644 apps/nezha-agent/latest/.env.sample
 delete mode 100644 apps/nezha-agent/latest/data.yml
 delete mode 100644 apps/nezha-agent/latest/docker-compose.yml

diff --git a/apps/nezha-agent/1.1.4/.env.sample b/apps/nezha-agent/1.1.4/.env.sample
deleted file mode 100644
index 83cbde051..000000000
--- a/apps/nezha-agent/1.1.4/.env.sample
+++ /dev/null
@@ -1,3 +0,0 @@
-CONTAINER_NAME="nezha-agent"
-NZ_CLENT_SECRET="xxxxx"
-NZ_GRPC_URL="http://1.2.3.4:5555"
diff --git a/apps/nezha-agent/1.1.4/data.yml b/apps/nezha-agent/1.1.4/data.yml
deleted file mode 100644
index 2121adb29..000000000
--- a/apps/nezha-agent/1.1.4/data.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-additionalProperties:
-  formFields:
-    - default: ""
-      edit: true
-      envKey: NZ_GRPC_URL
-      labelEn: "Nezha gRPC URL"
-      labelZh: 哪吒 gRPC 地址
-      label:
-        en: "Nezha gRPC URL"
-        zh: 哪吒 gRPC 地址
-      required: true
-      type: text
-    - default: ""
-      edit: true
-      envKey: NZ_CLENT_SECRET
-      labelEn: "Nezha client secret"
-      labelZh: 哪吒客户端密钥
-      label:
-        en: "Nezha client secret"
-        zh: 哪吒客户端密钥
-      required: true
-      type: password
diff --git a/apps/nezha-agent/1.1.4/docker-compose.yml b/apps/nezha-agent/1.1.4/docker-compose.yml
deleted file mode 100644
index d268dae35..000000000
--- a/apps/nezha-agent/1.1.4/docker-compose.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-services:
-  nezha-agent:
-    image: "whoer/nezha-agent:1.1.4"
-    container_name: ${CONTAINER_NAME} 
-    restart: always
-    command: --tls -s ${NZ_GRPC_URL} -p ${NZ_CLENT_SECRET} -d
-    volumes:
-      - /etc:/etc:ro
-    network_mode: host
-    labels:  
-      createdBy: "Apps"
\ No newline at end of file
diff --git a/apps/nezha-agent/1.14.1/data.yml b/apps/nezha-agent/1.14.1/data.yml
new file mode 100644
index 000000000..d725954ec
--- /dev/null
+++ b/apps/nezha-agent/1.14.1/data.yml
@@ -0,0 +1,52 @@
+additionalProperties:
+  formFields:
+    - default: ""
+      edit: true
+      envKey: NZ_GRPC_URL
+      labelEn: "Nezha Agent Endpoint"
+      labelZh: Agent 对接地址
+      label:
+        en: "Nezha Agent Endpoint"
+        zh: Agent 对接地址
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: NZ_CLENT_SECRET
+      labelEn: "Nezha client secret"
+      labelZh: 哪吒客户端密钥
+      label:
+        en: "Nezha client secret"
+        zh: 哪吒客户端密钥
+      required: true
+      type: password
+    - default: "true"
+      envKey: DISABLE_COMMAND_EXECUTE
+      labelZh: 命令执行
+      labelEn: Command Execute
+      label:
+        zh: 命令执行
+        en: Command Execute
+      required: false
+      type: select
+      edit: true
+      values:
+        - label: 启用 / Enabled
+          value: "false"
+        - label: 禁用 / Disabled
+          value: "true"
+    - default: "false"
+      envKey: GPU
+      labelZh: 启用 GPU 监控
+      labelEn: Enable GPU Monitoring
+      label:
+        zh: 启用 GPU 监控
+        en: Enable GPU Monitoring
+      required: false
+      type: select
+      edit: true
+      values:
+        - label: 启用 / Enabled
+          value: "true"
+        - label: 禁用 / Disabled
+          value: "false"
diff --git a/apps/nezha-agent/1.14.1/docker-compose.yml b/apps/nezha-agent/1.14.1/docker-compose.yml
new file mode 100644
index 000000000..85de42a61
--- /dev/null
+++ b/apps/nezha-agent/1.14.1/docker-compose.yml
@@ -0,0 +1,15 @@
+services:
+  nezha-agent:
+    image: kanggle/nezha-agent:v1.14.1
+    container_name: ${CONTAINER_NAME} 
+    restart: always
+    environment:
+      - CLIENT_SECRET=${NZ_CLENT_SECRET}
+      - SERVER=${NZ_GRPC_URL}
+      - GPU=${GPU}
+      - DISABLE_COMMAND_EXECUTE=${DISABLE_COMMAND_EXECUTE}
+      - DISABLE_AUTO_UPDATE=true
+      - DISABLE_FORCE_UPDATE=true
+    network_mode: host
+    labels:  
+      createdBy: "Apps"
\ No newline at end of file
diff --git a/apps/nezha-agent/README.md b/apps/nezha-agent/README.md
index d8c1510f6..4267c5bee 100644
--- a/apps/nezha-agent/README.md
+++ b/apps/nezha-agent/README.md
@@ -1,18 +1,12 @@
-# Nezha Agent
+## 配置和使用说明
 
-Nezha Agent 是哪吒监控的被控端服务，若启动后无法连接到 Nezha Server，请进入 `参数` - `高级设置` - `编辑 compose 文件` 删除 `command` 中的 `--tls` 参数。
+哪吒监控添加服务器时，从复制的安装命令里找到 `NZ_CLIENT_SECRET=xxx`，此为客户端密钥。
 
-Nezha 是一款强大的开源监控和可视化工具，主要用于实时监控服务器、应用性能、网络状况等，并提供直观的图形化展示。
+## 产品介绍
+
+哪吒监控 Agent 端的容器化部署方案，快速、轻松地启动和管理哪吒监控系统的 Agent 组件。
 
 ## 主要功能：
 
-- **实时监控**：Nezha 提供实时的服务器资源使用情况，如 CPU、内存、磁盘、网络等，帮助用户及时发现并处理性能问题。
-- **多设备支持**：支持监控多个设备的状态，可以集中管理多台服务器的数据。
-- **自定义告警**：用户可以设置自定义告警规则，当监控项超出预设值时，系统会发送告警通知，帮助及时处理问题。
-- **历史数据存储与查看**：Nezha 会记录监控数据，用户可以回溯查看历史性能趋势，方便进行长期分析和优化。
-- **支持多种监控插件**：Nezha 支持集成多种监控插件，扩展性强，可以根据需求添加对特定应用或服务的监控。
-- **可视化图表**：数据通过易读的图表形式展示，帮助用户直观理解系统性能与健康状态。
-- **轻量级部署**：Nezha 可以轻量级部署，资源占用低，非常适合中小型项目或个人开发者使用。
-- **多平台支持**：支持 Linux、Windows 等多种操作系统，适应性强。
-- **用户权限管理**：提供细粒度的用户权限控制，确保监控数据的安全性。
-- **开放API**：提供 RESTful API，方便与其他系统集成。
\ No newline at end of file
+- **容器化部署**：简化 Nezha Agent 的部署和配置过程，确保环境一致性。
+- **环境变量配置**：通过环境变量灵活配置，确保配置的安全性和灵活性。
diff --git a/apps/nezha-agent/data.yml b/apps/nezha-agent/data.yml
index 109f33935..6daeec0c6 100644
--- a/apps/nezha-agent/data.yml
+++ b/apps/nezha-agent/data.yml
@@ -18,5 +18,5 @@ additionalProperties:
   limit: 0
   recommend: 0
   website: https://nezha.wiki
-  github: https://github.com/naiba/nezha
-  document: https://nezha.wiki/guide/agent.html
+  github: https://github.com/nezhahq/agent
+  document: https://github.com/xmusphlkg/nezha-agent-docker
diff --git a/apps/nezha-agent/latest/.env.sample b/apps/nezha-agent/latest/.env.sample
deleted file mode 100644
index 83cbde051..000000000
--- a/apps/nezha-agent/latest/.env.sample
+++ /dev/null
@@ -1,3 +0,0 @@
-CONTAINER_NAME="nezha-agent"
-NZ_CLENT_SECRET="xxxxx"
-NZ_GRPC_URL="http://1.2.3.4:5555"
diff --git a/apps/nezha-agent/latest/data.yml b/apps/nezha-agent/latest/data.yml
deleted file mode 100644
index 2121adb29..000000000
--- a/apps/nezha-agent/latest/data.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-additionalProperties:
-  formFields:
-    - default: ""
-      edit: true
-      envKey: NZ_GRPC_URL
-      labelEn: "Nezha gRPC URL"
-      labelZh: 哪吒 gRPC 地址
-      label:
-        en: "Nezha gRPC URL"
-        zh: 哪吒 gRPC 地址
-      required: true
-      type: text
-    - default: ""
-      edit: true
-      envKey: NZ_CLENT_SECRET
-      labelEn: "Nezha client secret"
-      labelZh: 哪吒客户端密钥
-      label:
-        en: "Nezha client secret"
-        zh: 哪吒客户端密钥
-      required: true
-      type: password
diff --git a/apps/nezha-agent/latest/docker-compose.yml b/apps/nezha-agent/latest/docker-compose.yml
deleted file mode 100644
index 39b1bce48..000000000
--- a/apps/nezha-agent/latest/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-services:
-  nezha-agent:
-    image: "whoer/nezha-agent:latest"
-    pull_policy: always
-    container_name: ${CONTAINER_NAME}
-    restart: always
-    command: --tls -s ${NZ_GRPC_URL} -p ${NZ_CLENT_SECRET} -d
-    volumes:
-      - /etc:/etc:ro
-    network_mode: host
-    labels:
-      createdBy: "Apps"