From 1512389c75a30441d273471d7fbd6039a24f9ef7 Mon Sep 17 00:00:00 2001
From: pooneyy <85266337+pooneyy@users.noreply.github.com>
Date: Thu, 31 Jul 2025 14:49:11 +0800
Subject: [PATCH] Update Zabbix to v7.4.1

---
 apps/zabbix-server/{7.4.0&mysql => 7.4.1&mysql}/.env.sample | 0
 apps/zabbix-server/{7.4.0&mysql => 7.4.1&mysql}/conf/my.cnf | 0
 apps/zabbix-server/{7.4.0&mysql => 7.4.1&mysql}/data.yml    | 0
 .../{7.4.0&mysql => 7.4.1&mysql}/docker-compose.yml         | 6 +++---
 .../{7.4.0-postgres => 7.4.1-postgres}/.env.sample          | 0
 .../{7.4.0-postgres => 7.4.1-postgres}/data.yml             | 0
 .../{7.4.0-postgres => 7.4.1-postgres}/data/.gitkeep        | 0
 .../{7.4.0-postgres => 7.4.1-postgres}/docker-compose.yml   | 6 +++---
 .../{7.4.0-postgres => 7.4.1-postgres}/scripts/init.sh      | 0
 apps/zabbix-server/{7.4.0 => 7.4.1}/.env.sample             | 0
 apps/zabbix-server/{7.4.0 => 7.4.1}/data.yml                | 0
 apps/zabbix-server/{7.4.0 => 7.4.1}/docker-compose.yml      | 6 +++---
 12 files changed, 9 insertions(+), 9 deletions(-)
 rename apps/zabbix-server/{7.4.0&mysql => 7.4.1&mysql}/.env.sample (100%)
 rename apps/zabbix-server/{7.4.0&mysql => 7.4.1&mysql}/conf/my.cnf (100%)
 rename apps/zabbix-server/{7.4.0&mysql => 7.4.1&mysql}/data.yml (100%)
 rename apps/zabbix-server/{7.4.0&mysql => 7.4.1&mysql}/docker-compose.yml (92%)
 rename apps/zabbix-server/{7.4.0-postgres => 7.4.1-postgres}/.env.sample (100%)
 rename apps/zabbix-server/{7.4.0-postgres => 7.4.1-postgres}/data.yml (100%)
 rename apps/zabbix-server/{7.4.0-postgres => 7.4.1-postgres}/data/.gitkeep (100%)
 rename apps/zabbix-server/{7.4.0-postgres => 7.4.1-postgres}/docker-compose.yml (89%)
 rename apps/zabbix-server/{7.4.0-postgres => 7.4.1-postgres}/scripts/init.sh (100%)
 rename apps/zabbix-server/{7.4.0 => 7.4.1}/.env.sample (100%)
 rename apps/zabbix-server/{7.4.0 => 7.4.1}/data.yml (100%)
 rename apps/zabbix-server/{7.4.0 => 7.4.1}/docker-compose.yml (88%)

diff --git a/apps/zabbix-server/7.4.0&mysql/.env.sample b/apps/zabbix-server/7.4.1&mysql/.env.sample
similarity index 100%
rename from apps/zabbix-server/7.4.0&mysql/.env.sample
rename to apps/zabbix-server/7.4.1&mysql/.env.sample
diff --git a/apps/zabbix-server/7.4.0&mysql/conf/my.cnf b/apps/zabbix-server/7.4.1&mysql/conf/my.cnf
similarity index 100%
rename from apps/zabbix-server/7.4.0&mysql/conf/my.cnf
rename to apps/zabbix-server/7.4.1&mysql/conf/my.cnf
diff --git a/apps/zabbix-server/7.4.0&mysql/data.yml b/apps/zabbix-server/7.4.1&mysql/data.yml
similarity index 100%
rename from apps/zabbix-server/7.4.0&mysql/data.yml
rename to apps/zabbix-server/7.4.1&mysql/data.yml
diff --git a/apps/zabbix-server/7.4.0&mysql/docker-compose.yml b/apps/zabbix-server/7.4.1&mysql/docker-compose.yml
similarity index 92%
rename from apps/zabbix-server/7.4.0&mysql/docker-compose.yml
rename to apps/zabbix-server/7.4.1&mysql/docker-compose.yml
index a00713bcac..a9fbd0be86 100644
--- a/apps/zabbix-server/7.4.0&mysql/docker-compose.yml
+++ b/apps/zabbix-server/7.4.1&mysql/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
       - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
       - ZBX_JAVAGATEWAY=zabbix-java-gateway
-    image: zabbix/zabbix-server-mysql:7.4.0-alpine
+    image: zabbix/zabbix-server-mysql:7.4.1-alpine
     depends_on:
       - zabbix-java-gateway
       - mysql-server
@@ -47,7 +47,7 @@ services:
     restart: always
     networks:
       - 1panel-network
-    image: zabbix/zabbix-java-gateway:alpine-6.4.13
+    image: zabbix/zabbix-java-gateway:7.4.1-alpine
     labels:
       createdBy: Apps
 
@@ -65,7 +65,7 @@ services:
       - MYSQL_ROOT_PASSWORD=${MYSQL_PASSWORD}
     ports:
       - ${PANEL_APP_PORT_HTTP}:8080
-    image: zabbix/zabbix-web-nginx-mysql:alpine-6.4.13
+    image: zabbix/zabbix-web-nginx-mysql:7.4.1-alpine
     depends_on:
       - zabbix-server-mysql
       - mysql-server
diff --git a/apps/zabbix-server/7.4.0-postgres/.env.sample b/apps/zabbix-server/7.4.1-postgres/.env.sample
similarity index 100%
rename from apps/zabbix-server/7.4.0-postgres/.env.sample
rename to apps/zabbix-server/7.4.1-postgres/.env.sample
diff --git a/apps/zabbix-server/7.4.0-postgres/data.yml b/apps/zabbix-server/7.4.1-postgres/data.yml
similarity index 100%
rename from apps/zabbix-server/7.4.0-postgres/data.yml
rename to apps/zabbix-server/7.4.1-postgres/data.yml
diff --git a/apps/zabbix-server/7.4.0-postgres/data/.gitkeep b/apps/zabbix-server/7.4.1-postgres/data/.gitkeep
similarity index 100%
rename from apps/zabbix-server/7.4.0-postgres/data/.gitkeep
rename to apps/zabbix-server/7.4.1-postgres/data/.gitkeep
diff --git a/apps/zabbix-server/7.4.0-postgres/docker-compose.yml b/apps/zabbix-server/7.4.1-postgres/docker-compose.yml
similarity index 89%
rename from apps/zabbix-server/7.4.0-postgres/docker-compose.yml
rename to apps/zabbix-server/7.4.1-postgres/docker-compose.yml
index 02f0fdcb2e..7f5c3fe79a 100644
--- a/apps/zabbix-server/7.4.0-postgres/docker-compose.yml
+++ b/apps/zabbix-server/7.4.1-postgres/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   zabbix-server-pgsql:
     container_name: ${CONTAINER_NAME}
-    image: zabbix/zabbix-server-pgsql:7.4.0-alpine
+    image: zabbix/zabbix-server-pgsql:7.4.1-alpine
     environment:
       - DB_SERVER_HOST=${PANEL_DB_HOST}
       - POSTGRES_USER=${PANEL_DB_USER}
@@ -21,7 +21,7 @@ services:
 
   zabbix-snmptraps:
     container_name: ${CONTAINER_NAME}-snmptraps
-    image: zabbix/zabbix-snmptraps:7.4.0-alpine
+    image: zabbix/zabbix-snmptraps:7.4.1-alpine
     volumes:
       - ./data/snmptraps:/var/lib/zabbix/snmptraps:rw
       - ./data/mibs:/usr/share/snmp/mibs:ro
@@ -35,7 +35,7 @@ services:
 
   zabbix-web-nginx-pgsql:
     container_name: ${CONTAINER_NAME}-nginx
-    image: zabbix/zabbix-web-nginx-pgsql:7.4.0-alpine
+    image: zabbix/zabbix-web-nginx-pgsql:7.4.1-alpine
     environment:
       - ZBX_SERVER_HOST=zabbix-server-pgsql
       - DB_SERVER_HOST=${PANEL_DB_HOST}
diff --git a/apps/zabbix-server/7.4.0-postgres/scripts/init.sh b/apps/zabbix-server/7.4.1-postgres/scripts/init.sh
similarity index 100%
rename from apps/zabbix-server/7.4.0-postgres/scripts/init.sh
rename to apps/zabbix-server/7.4.1-postgres/scripts/init.sh
diff --git a/apps/zabbix-server/7.4.0/.env.sample b/apps/zabbix-server/7.4.1/.env.sample
similarity index 100%
rename from apps/zabbix-server/7.4.0/.env.sample
rename to apps/zabbix-server/7.4.1/.env.sample
diff --git a/apps/zabbix-server/7.4.0/data.yml b/apps/zabbix-server/7.4.1/data.yml
similarity index 100%
rename from apps/zabbix-server/7.4.0/data.yml
rename to apps/zabbix-server/7.4.1/data.yml
diff --git a/apps/zabbix-server/7.4.0/docker-compose.yml b/apps/zabbix-server/7.4.1/docker-compose.yml
similarity index 88%
rename from apps/zabbix-server/7.4.0/docker-compose.yml
rename to apps/zabbix-server/7.4.1/docker-compose.yml
index 7e441b9cda..a6b2becf18 100644
--- a/apps/zabbix-server/7.4.0/docker-compose.yml
+++ b/apps/zabbix-server/7.4.1/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - MYSQL_USER=${PANEL_DB_USER}
       - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
       - ZBX_JAVAGATEWAY=zabbix-java-gateway
-    image: zabbix/zabbix-server-mysql:7.4.0-alpine
+    image: zabbix/zabbix-server-mysql:7.4.1-alpine
     depends_on:
       - zabbix-java-gateway
     labels:
@@ -24,7 +24,7 @@ services:
     restart: always
     networks:
       - 1panel-network
-    image: zabbix/zabbix-java-gateway:7.4.0-alpine
+    image: zabbix/zabbix-java-gateway:7.4.1-alpine
     labels:
       createdBy: Apps
 
@@ -41,7 +41,7 @@ services:
       - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
     ports:
       - ${PANEL_APP_PORT_HTTP}:8080
-    image: zabbix/zabbix-web-nginx-mysql:7.4.0-alpine
+    image: zabbix/zabbix-web-nginx-mysql:7.4.1-alpine
     depends_on:
       - zabbix-server-mysql
     labels: