From dcd8c7cddd82a921cc31a521aaff8199d2b1c959 Mon Sep 17 00:00:00 2001 From: okxlin Date: Wed, 12 Jul 2023 09:45:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0synapse-admin=E3=80=81ng?= =?UTF-8?q?inx-ui=E3=80=81zabbix-gent=E5=88=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/nginx-ui/2.0.0-beta.3/data.yml | 4 ++-- apps/nginx-ui/{data.yml.bak => data.yml} | 0 apps/nginx-ui/latest/data.yml | 4 ++-- apps/synapse-admin/{data.yml.bak => data.yml} | 0 apps/zabbix-agent/{data.yml.bak => data.yml} | 0 .../{latest => 6.4.4-mysql}/.env.sample | 4 ++-- apps/zabbix-server/{6.4.4 => 6.4.4-mysql}/data.yml | 4 ++-- .../{6.4.4 => 6.4.4-mysql}/docker-compose.yml | 5 +++-- apps/zabbix-server/README.md | 14 ++++++++++++++ apps/zabbix-server/data.yml.bak | 2 +- .../{6.4.4 => latest-mysql}/.env.sample | 6 +++--- .../{latest => latest-mysql}/data.yml | 8 ++++---- .../{latest => latest-mysql}/docker-compose.yml | 5 +++-- 13 files changed, 36 insertions(+), 20 deletions(-) rename apps/nginx-ui/{data.yml.bak => data.yml} (100%) rename apps/synapse-admin/{data.yml.bak => data.yml} (100%) rename apps/zabbix-agent/{data.yml.bak => data.yml} (100%) rename apps/zabbix-server/{latest => 6.4.4-mysql}/.env.sample (77%) rename apps/zabbix-server/{6.4.4 => 6.4.4-mysql}/data.yml (96%) rename apps/zabbix-server/{6.4.4 => 6.4.4-mysql}/docker-compose.yml (91%) rename apps/zabbix-server/{6.4.4 => latest-mysql}/.env.sample (65%) rename apps/zabbix-server/{latest => latest-mysql}/data.yml (95%) rename apps/zabbix-server/{latest => latest-mysql}/docker-compose.yml (91%) diff --git a/apps/nginx-ui/2.0.0-beta.3/data.yml b/apps/nginx-ui/2.0.0-beta.3/data.yml index e36b5794..672be8eb 100644 --- a/apps/nginx-ui/2.0.0-beta.3/data.yml +++ b/apps/nginx-ui/2.0.0-beta.3/data.yml @@ -3,8 +3,8 @@ additionalProperties: - default: 31080 edit: true envKey: PANEL_APP_PORT_HTTP - labelEn: HTTP Port - labelZh: HTTP端口 + labelEn: Console Port + labelZh: 控制台端口 required: true rule: paramPort type: number diff --git a/apps/nginx-ui/data.yml.bak b/apps/nginx-ui/data.yml similarity index 100% rename from apps/nginx-ui/data.yml.bak rename to apps/nginx-ui/data.yml diff --git a/apps/nginx-ui/latest/data.yml b/apps/nginx-ui/latest/data.yml index e36b5794..672be8eb 100644 --- a/apps/nginx-ui/latest/data.yml +++ b/apps/nginx-ui/latest/data.yml @@ -3,8 +3,8 @@ additionalProperties: - default: 31080 edit: true envKey: PANEL_APP_PORT_HTTP - labelEn: HTTP Port - labelZh: HTTP端口 + labelEn: Console Port + labelZh: 控制台端口 required: true rule: paramPort type: number diff --git a/apps/synapse-admin/data.yml.bak b/apps/synapse-admin/data.yml similarity index 100% rename from apps/synapse-admin/data.yml.bak rename to apps/synapse-admin/data.yml diff --git a/apps/zabbix-agent/data.yml.bak b/apps/zabbix-agent/data.yml similarity index 100% rename from apps/zabbix-agent/data.yml.bak rename to apps/zabbix-agent/data.yml diff --git a/apps/zabbix-server/latest/.env.sample b/apps/zabbix-server/6.4.4-mysql/.env.sample similarity index 77% rename from apps/zabbix-server/latest/.env.sample rename to apps/zabbix-server/6.4.4-mysql/.env.sample index 0e81adb6..c6604601 100644 --- a/apps/zabbix-server/latest/.env.sample +++ b/apps/zabbix-server/6.4.4-mysql/.env.sample @@ -1,8 +1,8 @@ CONTAINER_NAME="zabbix-server" +PANEL_APP_PORT_HTTP2="10051" PANEL_APP_PORT_HTTP="40047" -PANEL_APP_PORT_HTTP2="40048" PANEL_DB_HOST="127.0.0.1" -FLARUM_DB_PORT="3306" +ZABBIX_DB_PORT="3306" PANEL_DB_NAME="zabbix" PANEL_DB_USER="zabbix" PANEL_DB_USER_PASSWORD="MyDBPWD_brls9UwcRasl" \ No newline at end of file diff --git a/apps/zabbix-server/6.4.4/data.yml b/apps/zabbix-server/6.4.4-mysql/data.yml similarity index 96% rename from apps/zabbix-server/6.4.4/data.yml rename to apps/zabbix-server/6.4.4-mysql/data.yml index 80d631cd..608ba920 100644 --- a/apps/zabbix-server/6.4.4/data.yml +++ b/apps/zabbix-server/6.4.4-mysql/data.yml @@ -50,7 +50,7 @@ additionalProperties: type: password - default: 10051 edit: true - envKey: PANEL_APP_PORT_HTTP + envKey: PANEL_APP_PORT_HTTP2 labelEn: Gateway port labelZh: 网关端口 required: true @@ -58,7 +58,7 @@ additionalProperties: type: number - default: 40047 edit: true - envKey: PANEL_APP_PORT_HTTP2 + envKey: PANEL_APP_PORT_HTTP labelEn: Port labelZh: 端口 required: true diff --git a/apps/zabbix-server/6.4.4/docker-compose.yml b/apps/zabbix-server/6.4.4-mysql/docker-compose.yml similarity index 91% rename from apps/zabbix-server/6.4.4/docker-compose.yml rename to apps/zabbix-server/6.4.4-mysql/docker-compose.yml index c157cba6..490935de 100644 --- a/apps/zabbix-server/6.4.4/docker-compose.yml +++ b/apps/zabbix-server/6.4.4-mysql/docker-compose.yml @@ -6,9 +6,10 @@ services: networks: - 1panel-network ports: - - "${PANEL_APP_PORT_HTTP}:10051" + - "${PANEL_APP_PORT_HTTP2}:10051" environment: - DB_SERVER_HOST=${PANEL_DB_HOST} + - DB_SERVER_PORT=${ZABBIX_DB_PORT} - MYSQL_DATABASE=${PANEL_DB_NAME} - MYSQL_USER=${PANEL_DB_USER} - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD} @@ -42,7 +43,7 @@ services: - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD} #- MYSQL_ROOT_PASSWORD=root_pwd ports: - - ${PANEL_APP_PORT_HTTP2}:8080 + - ${PANEL_APP_PORT_HTTP}:8080 image: zabbix/zabbix-web-nginx-mysql:alpine-6.4.4 depends_on: - zabbix-server-mysql diff --git a/apps/zabbix-server/README.md b/apps/zabbix-server/README.md index 2035c7bd..881ba98b 100644 --- a/apps/zabbix-server/README.md +++ b/apps/zabbix-server/README.md @@ -1,3 +1,17 @@ +# 使用说明 + +默认账户与密码 + +``` +username:admin +password:zabbix +``` + +**注意：Zabbix-MySQL版本的，Zabbix 6.X的需求环境MySQL8** + + +# 原始相关 + Zabbix is free software, released under the GNU General Public License (GPL) version 2. diff --git a/apps/zabbix-server/data.yml.bak b/apps/zabbix-server/data.yml.bak index d73ca98f..d4d2173a 100644 --- a/apps/zabbix-server/data.yml.bak +++ b/apps/zabbix-server/data.yml.bak @@ -13,7 +13,7 @@ additionalProperties: shortDescEn: Real-time monitoring of IT components and services (Server) type: tool crossVersionUpdate: true - limit: 0 + limit: 1 recommend: 0 website: https://www.zabbix.com/ github: https://github.com/zabbix/zabbix diff --git a/apps/zabbix-server/6.4.4/.env.sample b/apps/zabbix-server/latest-mysql/.env.sample similarity index 65% rename from apps/zabbix-server/6.4.4/.env.sample rename to apps/zabbix-server/latest-mysql/.env.sample index 7510a11a..c6604601 100644 --- a/apps/zabbix-server/6.4.4/.env.sample +++ b/apps/zabbix-server/latest-mysql/.env.sample @@ -1,8 +1,8 @@ CONTAINER_NAME="zabbix-server" -PANEL_APP_PORT_HTTP="10051" -PANEL_APP_PORT_HTTP2="40047" +PANEL_APP_PORT_HTTP2="10051" +PANEL_APP_PORT_HTTP="40047" PANEL_DB_HOST="127.0.0.1" -FLARUM_DB_PORT="3306" +ZABBIX_DB_PORT="3306" PANEL_DB_NAME="zabbix" PANEL_DB_USER="zabbix" PANEL_DB_USER_PASSWORD="MyDBPWD_brls9UwcRasl" \ No newline at end of file diff --git a/apps/zabbix-server/latest/data.yml b/apps/zabbix-server/latest-mysql/data.yml similarity index 95% rename from apps/zabbix-server/latest/data.yml rename to apps/zabbix-server/latest-mysql/data.yml index 4b945f60..608ba920 100644 --- a/apps/zabbix-server/latest/data.yml +++ b/apps/zabbix-server/latest-mysql/data.yml @@ -48,17 +48,17 @@ additionalProperties: required: true rule: paramComplexity type: password - - default: 40047 + - default: 10051 edit: true - envKey: PANEL_APP_PORT_HTTP + envKey: PANEL_APP_PORT_HTTP2 labelEn: Gateway port labelZh: 网关端口 required: true rule: paramPort type: number - - default: 40048 + - default: 40047 edit: true - envKey: PANEL_APP_PORT_HTTP2 + envKey: PANEL_APP_PORT_HTTP labelEn: Port labelZh: 端口 required: true diff --git a/apps/zabbix-server/latest/docker-compose.yml b/apps/zabbix-server/latest-mysql/docker-compose.yml similarity index 91% rename from apps/zabbix-server/latest/docker-compose.yml rename to apps/zabbix-server/latest-mysql/docker-compose.yml index 321313a4..c9c60851 100644 --- a/apps/zabbix-server/latest/docker-compose.yml +++ b/apps/zabbix-server/latest-mysql/docker-compose.yml @@ -6,9 +6,10 @@ services: networks: - 1panel-network ports: - - "${PANEL_APP_PORT_HTTP}:10051" + - "${PANEL_APP_PORT_HTTP2}:10051" environment: - DB_SERVER_HOST=${PANEL_DB_HOST} + - DB_SERVER_PORT=${ZABBIX_DB_PORT} - MYSQL_DATABASE=${PANEL_DB_NAME} - MYSQL_USER=${PANEL_DB_USER} - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD} @@ -42,7 +43,7 @@ services: - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD} #- MYSQL_ROOT_PASSWORD=root_pwd ports: - - ${PANEL_APP_PORT_HTTP2}:8080 + - ${PANEL_APP_PORT_HTTP}:8080 image: zabbix/zabbix-web-nginx-mysql:alpine-latest depends_on: - zabbix-server-mysql