Snarp/zabbix
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Added missing ZBX_VAULTPREFIX variable for web containers

Browse source
This commit is contained in:
Alexey Pustovalov 2026-01-28 18:12:20 +09:00
parent 8744bad832
commit aa88fc89b4
41 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfiles/web-apache-mysql/README.md
View file

@ -240,6 +240,7 @@ Additionally the image allows to specify many other environment variables listed
ZBX_VAULTDBPATH= # Available since 5.2.0 ZBX_VAULTDBPATH= # Available since 5.2.0
ZBX_VAULTURL=https://127.0.0.1:8200 # 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 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_ACTIVE=false # Available since 7.4.0
ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0

1
Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh
View file

@ -258,6 +258,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh
View file

@ -258,6 +258,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh
View file

@ -258,6 +258,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh
View file

@ -258,6 +258,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-apache-pgsql/README.md
View file

@ -240,6 +240,7 @@ Additionally the image allows to specify many other environment variables listed
ZBX_VAULTDBPATH= # Available since 5.2.0 ZBX_VAULTDBPATH= # Available since 5.2.0
ZBX_VAULTURL=https://127.0.0.1:8200 # 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 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_ACTIVE=false # Available since 7.4.0
ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0

1
Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
View file

@ -259,6 +259,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
View file

@ -259,6 +259,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh
View file

@ -259,6 +259,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh
View file

@ -259,6 +259,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-nginx-mysql/README.md
View file

@ -241,6 +241,7 @@ Additionally the image allows to specify many other environment variables listed
ZBX_VAULTDBPATH= # Available since 5.2.0 ZBX_VAULTDBPATH= # Available since 5.2.0
ZBX_VAULTURL=https://127.0.0.1:8200 # 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 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_ACTIVE=false # Available since 7.4.0
ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0

1
Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
View file

@ -309,6 +309,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh
View file

@ -309,6 +309,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh
View file

@ -309,6 +309,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh
View file

@ -309,6 +309,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh
View file

@ -309,6 +309,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-nginx-pgsql/README.md
View file

@ -240,6 +240,7 @@ Additionally the image allows to specify many other environment variables listed
ZBX_VAULTDBPATH= # Available since 5.2.0 ZBX_VAULTDBPATH= # Available since 5.2.0
ZBX_VAULTURL=https://127.0.0.1:8200 # 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 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_ACTIVE=false # Available since 7.4.0
ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0 ZBX_SERVER_TLS_CAFILE= # Available since 7.4.0

1
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
View file

@ -310,6 +310,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
View file

@ -310,6 +310,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
View file

@ -310,6 +310,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-nginx-pgsql/rhel/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-nginx-pgsql/rhel/docker-entrypoint.sh
View file

@ -310,6 +310,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View file

@ -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. // Vault configuration. Used if database credentials are stored in Vault secrets manager.
$DB['VAULT'] = getenv('ZBX_VAULT'); $DB['VAULT'] = getenv('ZBX_VAULT');
$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); $DB['VAULT_URL'] = getenv('ZBX_VAULTURL');
$DB['VAULT_PREFIX'] = getenv('ZBX_VAULTPREFIX');
$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); $DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH');
$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); $DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN');

1
Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View file

@ -310,6 +310,7 @@ prepare_zbx_php_config() {
export ZBX_VAULT=${ZBX_VAULT} export ZBX_VAULT=${ZBX_VAULT}
export ZBX_VAULTURL=${ZBX_VAULTURL} export ZBX_VAULTURL=${ZBX_VAULTURL}
export ZBX_VAULTPREFIX=${ZBX_VAULTPREFIX}
export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH} export ZBX_VAULTDBPATH=${ZBX_VAULTDBPATH}
export VAULT_TOKEN=${VAULT_TOKEN} export VAULT_TOKEN=${VAULT_TOKEN}
export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE} export ZBX_VAULTCERTFILE=${ZBX_VAULTCERTFILE}

1
env_vars/.env_web
View file

@ -10,6 +10,7 @@ ZBX_SERVER_NAME=Composed installation
# ZBX_VAULT= # Available since 6.2.0 # ZBX_VAULT= # Available since 6.2.0
# ZBX_VAULTDBPATH= # ZBX_VAULTDBPATH=
# ZBX_VAULTURL=https://127.0.0.1:8200 # ZBX_VAULTURL=https://127.0.0.1:8200
# ZBX_VAULTPREFIX= # Available since 7.0.0
# VAULT_TOKEN= # VAULT_TOKEN=
# ZBX_VAULTCERTFILE= # Available since 6.2.0 # ZBX_VAULTCERTFILE= # Available since 6.2.0
# ZBX_VAULTKEYFILE= # Available since 6.2.0 # ZBX_VAULTKEYFILE= # Available since 6.2.0