From 31cf0a9887c7f58473e7ff3e83c66463aee597eb Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sat, 11 Jul 2026 14:45:29 +0900 Subject: [PATCH] Fixed variable descriptions --- Dockerfiles/agent2/rhel/Dockerfile.cuda | 10 +++++----- Dockerfiles/proxy-mysql/README.md | 3 ++- Dockerfiles/proxy-mysql/rhel/README.html | 3 +-- Dockerfiles/proxy-sqlite3/rhel/README.html | 2 -- Dockerfiles/server-mysql/README.md | 1 + Dockerfiles/server-mysql/rhel/README.html | 3 +-- Dockerfiles/server-pgsql/README.md | 1 + Dockerfiles/server-pgsql/rhel/README.html | 3 +-- Dockerfiles/web-apache-mysql/README.md | 1 + Dockerfiles/web-apache-pgsql/README.md | 1 + Dockerfiles/web-nginx-mysql/README.md | 1 + Dockerfiles/web-nginx-mysql/rhel/README.html | 3 ++- Dockerfiles/web-nginx-pgsql/README.md | 1 + Dockerfiles/web-nginx-pgsql/rhel/README.html | 3 ++- 14 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Dockerfiles/agent2/rhel/Dockerfile.cuda b/Dockerfiles/agent2/rhel/Dockerfile.cuda index 05ac4f15..0bd95b72 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile.cuda +++ b/Dockerfiles/agent2/rhel/Dockerfile.cuda @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1.6 ARG OS_BASE_IMAGE=nvidia/cuda:12.9.0-base-ubi9 ARG MAJOR_VERSION=7.4 -ARG RELEASE=8 -ARG ZBX_VERSION=${MAJOR_VERSION}.8 +ARG RELEASE=12 +ARG ZBX_VERSION=${MAJOR_VERSION}.12 ARG BUILD_BASE_IMAGE=registry.connect.redhat.com/zabbix/zabbix-agent2-74:${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder @@ -25,9 +25,9 @@ ENV ZBX_PERSISTENTBUFFERFILE=$ZABBIX_USER_HOME_DIR/buffer/agent2.db \ LABEL description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ maintainer="alexey.pustovalov@zabbix.com" \ - name="zabbix/zabbix-agent2-trunk" \ + name="zabbix/zabbix-agent2-74" \ release="${RELEASE}" \ - run="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-trunk:${ZBX_VERSION}" \ + run="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-74:${ZBX_VERSION}" \ summary="Zabbix agent" \ url="https://www.zabbix.com/" \ vendor="Zabbix SIA" \ @@ -38,7 +38,7 @@ LABEL description="Zabbix agent 2 is deployed on a monitoring target to actively io.openshift.tags="zabbix,zabbix-agent" \ org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.description="Zabbix agent 2 is deployed on a monitoring target to actively monitor local resources and applications" \ - org.label-schema.docker.cmd="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-trunk:${ZBX_VERSION}" \ + org.label-schema.docker.cmd="docker run --name zabbix-agent2 --link zabbix-server:zabbix-server -p 10050:10050 -d registry.connect.redhat.com/zabbix/zabbix-agent2-74:${ZBX_VERSION}" \ org.label-schema.license="AGPL v3.0" \ org.label-schema.name="zabbix-agent2-rhel" \ org.label-schema.schema-version="1.0" \ diff --git a/Dockerfiles/proxy-mysql/README.md b/Dockerfiles/proxy-mysql/README.md index 96334d0c..d74b3348 100644 --- a/Dockerfiles/proxy-mysql/README.md +++ b/Dockerfiles/proxy-mysql/README.md @@ -127,7 +127,7 @@ With Docker Swarm or Kubernetes this works with secrets. That way it is replicat ```console printf "zabbix" | docker secret create MYSQL_USER - printf "zabbix" | docker secret create MYSQL_PASSWORD - -docker run --name some-zabbix-proxy-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD -e ZBX_SERVER_HOST="some-zabbix-server" -e ZBX_HOSTNAME=some-hostname -e ZBX_SERVER_HOST=some-zabbix-server --init -d zabbix/zabbix-proxy-mysql:tag +docker run --name some-zabbix-proxy-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD -e ZBX_SERVER_HOST="some-zabbix-server" -e ZBX_HOSTNAME=some-hostname --init -d zabbix/zabbix-proxy-mysql:tag ``` This method is also applicable for `MYSQL_ROOT_PASSWORD` with `MYSQL_ROOT_PASSWORD_FILE`. @@ -168,6 +168,7 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0 ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0 ZBX_VAULTDBPATH= # Available since 5.2.0 ZBX_VAULTPREFIX= # Available since 7.0.0 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0 diff --git a/Dockerfiles/proxy-mysql/rhel/README.html b/Dockerfiles/proxy-mysql/rhel/README.html index 65132c61..6ef60621 100644 --- a/Dockerfiles/proxy-mysql/rhel/README.html +++ b/Dockerfiles/proxy-mysql/rhel/README.html @@ -87,8 +87,6 @@ podman run --name some-zabbix-proxy-mysql -e DB_SERV

ZBX_TIMEOUT

The variable is used to specify timeout for processing checks. By default, value is 4.

-

ZBX_JAVAGATEWAY_ENABLE

-

The variable enable communication with Zabbix Java Gateway to collect Java related checks. By default, value is false.

Other variables

Additionally the image allows to specify many other environment variables listed below:

ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0
@@ -98,6 +96,7 @@ podman run --name some-zabbix-proxy-mysql -e DB_SERV
 ZBX_DBTLSKEYFILE= # Available since 5.0.0
 ZBX_DBTLSCIPHER= # Available since 5.0.0
 ZBX_DBTLSCIPHER13= # Available since 5.0.0
+ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
 ZBX_VAULTDBPATH= # Available since 5.2.0
 ZBX_VAULTPREFIX= # Available since 7.0.0
 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
diff --git a/Dockerfiles/proxy-sqlite3/rhel/README.html b/Dockerfiles/proxy-sqlite3/rhel/README.html
index 1587f70d..799da5d0 100644
--- a/Dockerfiles/proxy-sqlite3/rhel/README.html
+++ b/Dockerfiles/proxy-sqlite3/rhel/README.html
@@ -64,8 +64,6 @@ where 1995 is zabbix GID.

 
 
ZBX_TIMEOUT

 
The variable is used to specify timeout for processing checks. By default, value is 4.

-
ZBX_JAVAGATEWAY_ENABLE

-
The variable enable communication with Zabbix Java Gateway to collect Java related checks. By default, value is false.

 
Other variables

 
Additionally the image allows to specify many other environment variables listed below:

 
ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0
diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md
index 23b9141c..4a6a8346 100644
--- a/Dockerfiles/server-mysql/README.md
+++ b/Dockerfiles/server-mysql/README.md
@@ -136,6 +136,7 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0
 ZBX_DBTLSKEYFILE= # Available since 5.0.0
 ZBX_DBTLSCIPHER= # Available since 5.0.0
 ZBX_DBTLSCIPHER13= # Available since 5.0.0
+ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
 ZBX_VAULTDBPATH= # Available since 5.2.0
 ZBX_VAULTPREFIX= # Available since 7.0.0
 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
diff --git a/Dockerfiles/server-mysql/rhel/README.html b/Dockerfiles/server-mysql/rhel/README.html
index 69237ea4..9bcabfac 100644
--- a/Dockerfiles/server-mysql/rhel/README.html
+++ b/Dockerfiles/server-mysql/rhel/README.html
@@ -71,8 +71,6 @@ podman run --name some-zabbix-server-mysql -e DB_SER
 
 
ZBX_TIMEOUT

 
The variable is used to specify timeout for processing checks. By default, value is 4.

-
ZBX_JAVAGATEWAY_ENABLE

-
The variable enable communication with Zabbix Java Gateway to collect Java related checks. By default, value is false.

 
Other variables

 
Additionally the image allows to specify many other environment variables listed below:

 
ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0
@@ -83,6 +81,7 @@ podman run --name some-zabbix-server-mysql -e DB_SER
 ZBX_DBTLSCIPHER= # Available since 5.0.0
 ZBX_DBTLSCIPHER13= # Available since 5.0.0
 ZBX_VAULTPREFIX= # Available since 7.0.0
+ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
 ZBX_VAULTDBPATH= # Available since 5.2.0
 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
 VAULT_TOKEN= # Available since 5.2.0
diff --git a/Dockerfiles/server-pgsql/README.md b/Dockerfiles/server-pgsql/README.md
index ddec6242..9e59b6b2 100644
--- a/Dockerfiles/server-pgsql/README.md
+++ b/Dockerfiles/server-pgsql/README.md
@@ -137,6 +137,7 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0
 ZBX_DBTLSKEYFILE= # Available since 5.0.0
 ZBX_DBTLSCIPHER= # Available since 5.0.0
 ZBX_DBTLSCIPHER13= # Available since 5.0.0
+ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
 ZBX_VAULTDBPATH= # Available since 5.2.0
 ZBX_VAULTPREFIX= # Available since 7.0.0
 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
diff --git a/Dockerfiles/server-pgsql/rhel/README.html b/Dockerfiles/server-pgsql/rhel/README.html
index c1a0cc3a..f435c80d 100644
--- a/Dockerfiles/server-pgsql/rhel/README.html
+++ b/Dockerfiles/server-pgsql/rhel/README.html
@@ -71,8 +71,6 @@ podman run --name some-zabbix-server-pgsql -e DB_SER
 
 
ZBX_TIMEOUT

 
The variable is used to specify timeout for processing checks. By default, value is 4.

-
ZBX_JAVAGATEWAY_ENABLE

-
The variable enable communication with Zabbix Java Gateway to collect Java related checks. By default, value is false.

 
Other variables

 
Additionally the image allows to specify many other environment variables listed below:

 
ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0
@@ -83,6 +81,7 @@ podman run --name some-zabbix-server-pgsql -e DB_SER
 ZBX_DBTLSCIPHER= # Available since 5.0.0
 ZBX_DBTLSCIPHER13= # Available since 5.0.0
 ZBX_VAULTPREFIX= # Available since 7.0.0
+ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
 ZBX_VAULTDBPATH= # Available since 5.2.0
 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
 VAULT_TOKEN= # Available since 5.2.0
diff --git a/Dockerfiles/web-apache-mysql/README.md b/Dockerfiles/web-apache-mysql/README.md
index 0e870995..07d36315 100644
--- a/Dockerfiles/web-apache-mysql/README.md
+++ b/Dockerfiles/web-apache-mysql/README.md
@@ -237,6 +237,7 @@ The variable allows to disable user HTTP authentication.
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
+ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
 ZBX_VAULTDBPATH= # Available since 5.2.0
 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
 VAULT_TOKEN= # Available since 5.2.0
diff --git a/Dockerfiles/web-apache-pgsql/README.md b/Dockerfiles/web-apache-pgsql/README.md
index bb679b11..039812d9 100644
--- a/Dockerfiles/web-apache-pgsql/README.md
+++ b/Dockerfiles/web-apache-pgsql/README.md
@@ -237,6 +237,7 @@ The variable allows to disable user HTTP authentication.
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
+ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
 ZBX_VAULTDBPATH= # Available since 5.2.0
 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
 VAULT_TOKEN= # Available since 5.2.0
diff --git a/Dockerfiles/web-nginx-mysql/README.md b/Dockerfiles/web-nginx-mysql/README.md
index 65ffba0c..6aa3998a 100644
--- a/Dockerfiles/web-nginx-mysql/README.md
+++ b/Dockerfiles/web-nginx-mysql/README.md
@@ -238,6 +238,7 @@ The variable allows to disable user HTTP authentication.
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
+ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
 ZBX_VAULTDBPATH= # Available since 5.2.0
 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
 VAULT_TOKEN= # Available since 5.2.0
diff --git a/Dockerfiles/web-nginx-mysql/rhel/README.html b/Dockerfiles/web-nginx-mysql/rhel/README.html
index 311394e5..a9a5bf18 100644
--- a/Dockerfiles/web-nginx-mysql/rhel/README.html
+++ b/Dockerfiles/web-nginx-mysql/rhel/README.html
@@ -117,7 +117,8 @@ podman run --name some-zabbix-web-nginx-mysql -e DB_
 
The variable allows to disable user HTTP authentication.

 
Other variables

 
Additionally the image allows to specify many other environment variables listed below:

-
ZBX_VAULTDBPATH= # Available since 5.2.0
+
ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
+ZBX_VAULTDBPATH= # Available since 5.2.0
 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
 VAULT_TOKEN= # Available since 5.2.0
 
diff --git a/Dockerfiles/web-nginx-pgsql/README.md b/Dockerfiles/web-nginx-pgsql/README.md
index 442c660b..103b85df 100644
--- a/Dockerfiles/web-nginx-pgsql/README.md
+++ b/Dockerfiles/web-nginx-pgsql/README.md
@@ -237,6 +237,7 @@ The variable allows to disable user HTTP authentication.
 Additionally the image allows to specify many other environment variables listed below:
 
 ```
+ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
 ZBX_VAULTDBPATH= # Available since 5.2.0
 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
 VAULT_TOKEN= # Available since 5.2.0
diff --git a/Dockerfiles/web-nginx-pgsql/rhel/README.html b/Dockerfiles/web-nginx-pgsql/rhel/README.html
index 42edfa01..e0706d31 100644
--- a/Dockerfiles/web-nginx-pgsql/rhel/README.html
+++ b/Dockerfiles/web-nginx-pgsql/rhel/README.html
@@ -117,7 +117,8 @@ podman run --name some-zabbix-web-nginx-pgsql -e DB_
 
The variable allows to disable user HTTP authentication.

 
Other variables

 
Additionally the image allows to specify many other environment variables listed below:

-
ZBX_VAULTDBPATH= # Available since 5.2.0
+
ZBX_VAULT=HashiCorp # Allowed values: HashiCorp, CyberArk. Required when Vault is used. Available since 6.2.0
+ZBX_VAULTDBPATH= # Available since 5.2.0
 ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
 VAULT_TOKEN= # Available since 5.2.0