From 68e583ec61f642b13d8f94023daa693df47b811f Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sat, 11 Jul 2026 01:48:26 +0900 Subject: [PATCH] Merge changes with Zabbix trunk --- Dockerfiles/agent/rhel/README.html | 2 +- Dockerfiles/agent2/rhel/README.html | 2 +- Dockerfiles/build-base/rhel/Dockerfile | 2 +- Dockerfiles/java-gateway/alpine/Dockerfile | 1 - Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 6 +++--- Dockerfiles/server-mysql/README.md | 1 - Dockerfiles/server-mysql/rhel/README.html | 1 - Dockerfiles/server-pgsql/README.md | 1 - Dockerfiles/server-pgsql/rhel/README.html | 1 - .../alpine/conf/etc/nginx/includes/server-common.conf | 2 +- Dockerfiles/web-nginx-pgsql/rhel/Dockerfile | 6 +++--- 11 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Dockerfiles/agent/rhel/README.html b/Dockerfiles/agent/rhel/README.html index c323a682..72a03709 100644 --- a/Dockerfiles/agent/rhel/README.html +++ b/Dockerfiles/agent/rhel/README.html @@ -115,7 +115,7 @@

Issues

If you have any problems with or questions about this image, please contact us through a GitHub issue.

Known issues

-

Currently it is not allowed to specify ZBX_ALIAS environment variable. Please use /etc/zabbix/zabbix_agent.d volume with additional configuration files with Alias options.

+

Currently it is not allowed to specify ZBX_ALIAS environment variable. Please use /etc/zabbix/zabbix_agentd.d volume with additional configuration files with Alias options.

Contributing

You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.

Before you start to code, we recommend discussing your plans through a GitHub issue, especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.

diff --git a/Dockerfiles/agent2/rhel/README.html b/Dockerfiles/agent2/rhel/README.html index 1351fc9c..d85d4fac 100644 --- a/Dockerfiles/agent2/rhel/README.html +++ b/Dockerfiles/agent2/rhel/README.html @@ -107,7 +107,7 @@

Issues

If you have any problems with or questions about this image, please contact us through a GitHub issue.

Known issues

-

Currently it is not allowed to specify ZBX_ALIAS environment variable. Please use /etc/zabbix/zabbix_agent.d volume with additional configuration files with Alias options.

+

Currently it is not allowed to specify ZBX_ALIAS environment variable. Please use /etc/zabbix/zabbix_agentd.d volume with additional configuration files with Alias options.

Contributing

You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.

Before you start to code, we recommend discussing your plans through a GitHub issue, especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.

diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index c8422acd..79a28750 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -16,7 +16,7 @@ ENV TERM=xterm \ LABEL description="Prepared environment to build Zabbix components" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-build-base-trunk" \ + name="zabbix/zabbix-build-base-74" \ release="${RELEASE}" \ summary="Zabbix build base" \ url="https://www.zabbix.com/" \ diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 52379684..d165defe 100644 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ b/Dockerfiles/java-gateway/alpine/Dockerfile @@ -59,7 +59,6 @@ RUN set -eux && \ --home ${ZABBIX_USER_HOME_DIR} \ zabbix && \ mkdir -p ${ZABBIX_CONF_DIR}/ \ - /usr/bin/entrypoint_lib/ \ /usr/sbin/zabbix_java/ext_lib/ && \ rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \ mv /usr/sbin/zabbix_java/lib/logback-console.xml ${ZABBIX_CONF_DIR}/zabbix_java_gateway_logback.xml && \ diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index 859c1161..22a7f592 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -42,12 +42,12 @@ LABEL description="Zabbix proxy with SQLite3 database support" \ io.k8s.description="Zabbix proxy with SQLite3 database support" \ io.k8s.display-name="Zabbix proxy (SQLite3)" \ io.openshift.expose-services="10051:10051" \ - io.openshift.tags="zabbix,zabbix-proxy,sqlite" \ + io.openshift.tags="zabbix,zabbix-proxy,sqlite3" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix proxy with SQLite3 database support" \ - org.label-schema.docker.cmd="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite3-74:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-proxy -p 10051:10051 -d registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-74:${ZBX_VERSION}" \ org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-proxy-sqlite-rhel" \ + org.label-schema.name="zabbix-proxy-sqlite3-rhel" \ org.label-schema.schema-version="1.0" \ org.label-schema.url="https://zabbix.com/" \ org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \ diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md index 5e310b8c..23b9141c 100644 --- a/Dockerfiles/server-mysql/README.md +++ b/Dockerfiles/server-mysql/README.md @@ -179,7 +179,6 @@ ZBX_SMSDEVICES= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 -ZBX_SENDERFREQUENCY=30 # Deprecated since 3.4.0 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=10 ZBX_STARTDBSYNCERS=4 diff --git a/Dockerfiles/server-mysql/rhel/README.html b/Dockerfiles/server-mysql/rhel/README.html index 80947acc..69237ea4 100644 --- a/Dockerfiles/server-mysql/rhel/README.html +++ b/Dockerfiles/server-mysql/rhel/README.html @@ -125,7 +125,6 @@ podman run --name some-zabbix-server-mysql -e DB_SER ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 -ZBX_SENDERFREQUENCY=30 # Depcrecated since 3.4.0 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=10 ZBX_STARTDBSYNCERS=4 diff --git a/Dockerfiles/server-pgsql/README.md b/Dockerfiles/server-pgsql/README.md index 730839f6..ddec6242 100644 --- a/Dockerfiles/server-pgsql/README.md +++ b/Dockerfiles/server-pgsql/README.md @@ -180,7 +180,6 @@ ZBX_SMSDEVICES= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 -ZBX_SENDERFREQUENCY=30 # Deprecated since 3.4.0 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=10 ZBX_STARTDBSYNCERS=4 diff --git a/Dockerfiles/server-pgsql/rhel/README.html b/Dockerfiles/server-pgsql/rhel/README.html index b59bd39e..c1a0cc3a 100644 --- a/Dockerfiles/server-pgsql/rhel/README.html +++ b/Dockerfiles/server-pgsql/rhel/README.html @@ -125,7 +125,6 @@ podman run --name some-zabbix-server-pgsql -e DB_SER ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 -ZBX_SENDERFREQUENCY=30 # Depcrecated since 3.4.0 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=10 ZBX_STARTDBSYNCERS=4 diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf index 2990d760..7c9533db 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf @@ -43,7 +43,7 @@ location ~* \.(woff|woff2|ttf|otf)$ { expires 30d; } -location ~ ^/(app/|conf/|include/|local/|locale/|vendor/) { +location ~ /(app\/|conf[^\.]|include\/|local\/|locale\/|vendor\/) { deny all; return 404; } diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile index d34fb026..d42105de 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile @@ -43,7 +43,7 @@ LABEL description="Zabbix web-interface based on Nginx web server with PostgreSQ maintainer="alexey.pustovalov@zabbix.com" \ name="zabbix/zabbix-web-pgsql-74" \ release="${RELEASE}" \ - run="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74-74:${ZBX_VERSION}" \ + run="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74:${ZBX_VERSION}" \ summary="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ url="https://www.zabbix.com/" \ vendor="Zabbix SIA" \ @@ -54,9 +54,9 @@ LABEL description="Zabbix web-interface based on Nginx web server with PostgreSQ io.openshift.tags="zabbix,zabbix-web,pgsql,nginx" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ - org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74-74:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-web-nginx --link postgresql:pgsql-server --link zabbix-server:zabbix-server -p 80:80 -d registry.connect.redhat.com/zabbix/zabbix-web-pgsql-74:${ZBX_VERSION}" \ org.label-schema.license="AGPL v3.0" \ - org.label-schema.name="zabbix-web-pgsql-74-rhel" \ + org.label-schema.name="zabbix-web-pgsql-rhel" \ org.label-schema.schema-version="1.0" \ org.label-schema.url="https://zabbix.com/" \ org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \