From aa88fc89b4142a081ad687c09da839fa1cb9b270 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 28 Jan 2026 18:12:20 +0900 Subject: [PATCH] Added missing ZBX_VAULTPREFIX variable for web containers --- Dockerfiles/web-apache-mysql/README.md | 1 + .../web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh | 1 + .../web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh | 1 + .../web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh | 1 + .../web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh | 1 + Dockerfiles/web-apache-pgsql/README.md | 1 + .../web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh | 1 + .../web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh | 1 + .../web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh | 1 + .../web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh | 1 + Dockerfiles/web-nginx-mysql/README.md | 1 + .../web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh | 1 + .../web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh | 1 + .../web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh | 1 + .../web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh | 1 + .../web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh | 1 + Dockerfiles/web-nginx-pgsql/README.md | 1 + .../web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh | 1 + .../web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh | 1 + .../web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh | 1 + .../web-nginx-pgsql/rhel/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh | 1 + .../web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 1 + Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 1 + env_vars/.env_web | 1 + 41 files changed, 41 insertions(+) diff --git a/Dockerfiles/web-apache-mysql/README.md b/Dockerfiles/web-apache-mysql/README.md index 2f2700af..88456794 100644 --- a/Dockerfiles/web-apache-mysql/README.md +++ b/Dockerfiles/web-apache-mysql/README.md @@ -240,6 +240,7 @@ Additionally the image allows to specify many other environment variables listed 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 +ZBX_VAULTPREFIX= # Available since 7.0.0 ZBX_SERVER_TLS_ACTIVE=false # Available since 7.4.0 ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh index 3d76eac9..09757f5a 100755 --- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh @@ -258,6 +258,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh index 99354d6d..d78e2816 100755 --- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh @@ -258,6 +258,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh index 99354d6d..d78e2816 100755 --- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh @@ -258,6 +258,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh index d1686736..68219d7d 100755 --- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -258,6 +258,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-apache-pgsql/README.md b/Dockerfiles/web-apache-pgsql/README.md index 2590b735..4df9a25c 100644 --- a/Dockerfiles/web-apache-pgsql/README.md +++ b/Dockerfiles/web-apache-pgsql/README.md @@ -240,6 +240,7 @@ Additionally the image allows to specify many other environment variables listed 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 +ZBX_VAULTPREFIX= # Available since 7.0.0 ZBX_SERVER_TLS_ACTIVE=false # Available since 7.4.0 ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh index 16cb31f6..904141ce 100755 --- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -259,6 +259,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh index b282764e..d234dc99 100755 --- a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh @@ -259,6 +259,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh index 14cc9cbe..663f8b5a 100755 --- a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh @@ -259,6 +259,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh index cb689c43..ceb047f9 100755 --- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -259,6 +259,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-nginx-mysql/README.md b/Dockerfiles/web-nginx-mysql/README.md index 1c3c1f48..9d02c678 100644 --- a/Dockerfiles/web-nginx-mysql/README.md +++ b/Dockerfiles/web-nginx-mysql/README.md @@ -241,6 +241,7 @@ Additionally the image allows to specify many other environment variables listed 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 +ZBX_VAULTPREFIX= # Available since 7.0.0 ZBX_SERVER_TLS_ACTIVE=false # Available since 7.4.0 ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index da2ac92a..e05a597d 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -309,6 +309,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh index e1581522..356398f6 100755 --- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh @@ -309,6 +309,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh index e1581522..356398f6 100755 --- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh @@ -309,6 +309,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh index e1581522..356398f6 100755 --- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh @@ -309,6 +309,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 04264a83..37e32220 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -309,6 +309,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-nginx-pgsql/README.md b/Dockerfiles/web-nginx-pgsql/README.md index 1f11dcae..f11a6624 100644 --- a/Dockerfiles/web-nginx-pgsql/README.md +++ b/Dockerfiles/web-nginx-pgsql/README.md @@ -240,6 +240,7 @@ Additionally the image allows to specify many other environment variables listed 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 +ZBX_VAULTPREFIX= # Available since 7.0.0 ZBX_SERVER_TLS_ACTIVE=false # Available since 7.4.0 ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh index 5a99b18b..7fd1557e 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -310,6 +310,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh index 9bec5c07..2d41d36b 100755 --- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -310,6 +310,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh index 9bec5c07..2d41d36b 100755 --- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh @@ -310,6 +310,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh index 9bec5c07..2d41d36b 100755 --- a/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh @@ -310,6 +310,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index fcbfc631..8217bfa9 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -29,6 +29,7 @@ $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_ // Vault configuration. Used if database credentials are stored in Vault secrets manager. $DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 3209ea9d..c9d9ca80 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -310,6 +310,7 @@ prepare_zbx_php_config() { export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULTURL=${ZBX_VAULTURL} + export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export VAULT_TOKEN=${VAULT_TOKEN} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} diff --git a/env_vars/.env_web b/env_vars/.env_web index ba2b385b..a80563d0 100644 --- a/env_vars/.env_web +++ b/env_vars/.env_web @@ -10,6 +10,7 @@ ZBX_SERVER_NAME=Composed installation # ZBX_VAULT= # Available since 6.2.0 # ZBX_VAULTDBPATH= # ZBX_VAULTURL=https://127.0.0.1:8200 +# ZBX_VAULTPREFIX= # Available since 7.0.0 # VAULT_TOKEN= # ZBX_VAULTCERTFILE= # Available since 6.2.0 # ZBX_VAULTKEYFILE= # Available since 6.2.0