From 31f62e2c61b155b09fec32b25d695a3701b6581e Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 21 May 2024 21:19:12 +0900 Subject: [PATCH] Added new parameters for server and proxy --- Dockerfiles/proxy-mysql/README.md | 4 ++++ Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh | 5 +++++ Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh | 5 +++++ Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh | 5 +++++ Dockerfiles/proxy-mysql/rhel/README.html | 3 +++ Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh | 5 +++++ Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh | 5 +++++ Dockerfiles/proxy-sqlite3/README.md | 3 +++ Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh | 3 +++ Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh | 3 +++ Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh | 3 +++ Dockerfiles/proxy-sqlite3/rhel/README.html | 2 ++ Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh | 3 +++ Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh | 3 +++ Dockerfiles/server-mysql/README.md | 3 +++ Dockerfiles/server-mysql/alpine/docker-entrypoint.sh | 6 ++++++ Dockerfiles/server-mysql/centos/docker-entrypoint.sh | 6 ++++++ Dockerfiles/server-mysql/ol/docker-entrypoint.sh | 6 ++++++ Dockerfiles/server-mysql/rhel/README.html | 4 ++++ Dockerfiles/server-mysql/rhel/docker-entrypoint.sh | 6 ++++++ Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh | 6 ++++++ Dockerfiles/server-pgsql/README.md | 4 ++++ Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh | 6 ++++++ Dockerfiles/server-pgsql/centos/docker-entrypoint.sh | 6 ++++++ Dockerfiles/server-pgsql/ol/docker-entrypoint.sh | 6 ++++++ Dockerfiles/server-pgsql/rhel/README.html | 4 ++++ Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh | 6 ++++++ Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh | 6 ++++++ env_vars/.env_prx | 3 +++ env_vars/.env_srv | 4 ++++ 30 files changed, 134 insertions(+) diff --git a/Dockerfiles/proxy-mysql/README.md b/Dockerfiles/proxy-mysql/README.md index 7a76e3996..1a706f5d6 100644 --- a/Dockerfiles/proxy-mysql/README.md +++ b/Dockerfiles/proxy-mysql/README.md @@ -171,6 +171,7 @@ ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.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 VAULT_TOKEN= # Available since 5.2.0 ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0 @@ -232,6 +233,9 @@ ZBX_TLSCIPHERCERT= # Available since 4.4.7 ZBX_TLSCIPHERCERT13= # Available since 4.4.7 ZBX_TLSCIPHERPSK= # Available since 4.4.7 ZBX_TLSCIPHERPSK13= # Available since 4.4.7 +ZBX_WEBDRIVERURL= # Available since 7.0.0 +ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0 + ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh index 8ad2a71d0..1fd2805ce 100755 --- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh @@ -385,6 +385,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -393,6 +394,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -506,6 +508,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh index edea840f0..7d5335148 100755 --- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh @@ -382,6 +382,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -390,6 +391,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -503,6 +505,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh index edea840f0..7d5335148 100755 --- a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh @@ -382,6 +382,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -390,6 +391,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -503,6 +505,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/proxy-mysql/rhel/README.html b/Dockerfiles/proxy-mysql/rhel/README.html index 38fd1633b..bae407d81 100644 --- a/Dockerfiles/proxy-mysql/rhel/README.html +++ b/Dockerfiles/proxy-mysql/rhel/README.html @@ -99,6 +99,7 @@ podman run --name some-zabbix-proxy-mysql -e DB_SERV ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.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 VAULT_TOKEN= # Available since 5.2.0 ZBX_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0 @@ -160,6 +161,8 @@ podman run --name some-zabbix-proxy-mysql -e DB_SERV ZBX_TLSCIPHERCERT13= # Available since 4.4.7 ZBX_TLSCIPHERPSK= # Available since 4.4.7 ZBX_TLSCIPHERPSK13= # Available since 4.4.7 +ZBX_WEBDRIVERURL= # Available since 7.0.0 +ZBX_STARTBROWSERPOLLERS= # Available since 7.0.0

Default values of these variables are specified after equal sign.

The allowed variables are identical of parameters in official zabbix_proxy.conf. For example, ZBX_LOGSLOWQUERIES = LogSlowQueries.

Please use official documentation for zabbix_proxy.conf to get more information about the variables.

diff --git a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh index edea840f0..7d5335148 100755 --- a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh @@ -382,6 +382,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -390,6 +391,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -503,6 +505,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh index ea908847f..bbd2cb745 100755 --- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -382,6 +382,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -390,6 +391,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -503,6 +505,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/proxy-sqlite3/README.md b/Dockerfiles/proxy-sqlite3/README.md index 9fc6b138d..a39cb6d09 100644 --- a/Dockerfiles/proxy-sqlite3/README.md +++ b/Dockerfiles/proxy-sqlite3/README.md @@ -186,6 +186,9 @@ ZBX_TLSCIPHERCERT= # Available since 4.4.7 ZBX_TLSCIPHERCERT13= # Available since 4.4.7 ZBX_TLSCIPHERPSK= # Available since 4.4.7 ZBX_TLSCIPHERPSK13= # Available since 4.4.7 +ZBX_WEBDRIVERURL= # Available since 7.0.0 +ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0 + ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh index f024465e8..aa34e6e6c 100755 --- a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -254,6 +254,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_proxy() { diff --git a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh index f024465e8..aa34e6e6c 100755 --- a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh @@ -254,6 +254,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_proxy() { diff --git a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh index f024465e8..aa34e6e6c 100755 --- a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh @@ -254,6 +254,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_proxy() { diff --git a/Dockerfiles/proxy-sqlite3/rhel/README.html b/Dockerfiles/proxy-sqlite3/rhel/README.html index 86e176eda..016559c03 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/README.html +++ b/Dockerfiles/proxy-sqlite3/rhel/README.html @@ -127,6 +127,8 @@ where 1995 is zabbix GID.

ZBX_TLSCIPHERCERT13= # Available since 4.4.7 ZBX_TLSCIPHERPSK= # Available since 4.4.7 ZBX_TLSCIPHERPSK13= # Available since 4.4.7 +ZBX_WEBDRIVERURL= # Available since 7.0.0 +ZBX_STARTBROWSERPOLLERS= # Available since 7.0.0

Default values of these variables are specified after equal sign.

The allowed variables are identical of parameters in official zabbix_proxy.conf. For example, ZBX_LOGSLOWQUERIES = LogSlowQueries.

Please use official documentation for zabbix_proxy.conf to get more information about the variables.

diff --git a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh index f024465e8..aa34e6e6c 100755 --- a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh @@ -254,6 +254,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_proxy() { diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh index 24b0b1994..fe8d332be 100755 --- a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -254,6 +254,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_proxy() { diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md index fd075f43e..35d1e2c3e 100644 --- a/Dockerfiles/server-mysql/README.md +++ b/Dockerfiles/server-mysql/README.md @@ -139,6 +139,7 @@ ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.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 VAULT_TOKEN= # Available since 5.2.0 ZBX_LISTENIP= @@ -214,6 +215,8 @@ ZBX_TLSCIPHERCERT= # Available since 4.4.7 ZBX_TLSCIPHERCERT13= # Available since 4.4.7 ZBX_TLSCIPHERPSK= # Available since 4.4.7 ZBX_TLSCIPHERPSK13= # Available since 4.4.7 +ZBX_WEBDRIVERURL= # Available since 7.0.0 +ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0 ``` diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh index c80642442..a15d8a88a 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -382,6 +382,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -390,6 +391,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -523,6 +525,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" @@ -546,6 +549,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh index 9606fdd2a..3860639ef 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -379,6 +379,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -387,6 +388,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -520,6 +522,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" @@ -543,6 +546,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh index 9606fdd2a..3860639ef 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -379,6 +379,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -387,6 +388,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -520,6 +522,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" @@ -543,6 +546,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/server-mysql/rhel/README.html b/Dockerfiles/server-mysql/rhel/README.html index effca9bc8..fee69ce84 100644 --- a/Dockerfiles/server-mysql/rhel/README.html +++ b/Dockerfiles/server-mysql/rhel/README.html @@ -82,6 +82,7 @@ podman run --name some-zabbix-server-mysql -e DB_SER ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_VAULTPREFIX= # Available since 7.0.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 @@ -158,6 +159,9 @@ podman run --name some-zabbix-server-mysql -e DB_SER ZBX_TLSCIPHERCERT13= # Available since 4.4.7 ZBX_TLSCIPHERPSK= # Available since 4.4.7 ZBX_TLSCIPHERPSK13= # Available since 4.4.7 +ZBX_ALLOWSOFTWAREUPDATECHECK=1 # Available since 7.0.0 +ZBX_WEBDRIVERURL= # Available since 7.0.0 +ZBX_STARTBROWSERPOLLERS= # Available since 7.0.0

Default values of these variables are specified after equal sign.

The allowed variables are identical of parameters in official zabbix_server.conf. For example, ZBX_LOGSLOWQUERIES = LogSlowQueries.

Please use official documentation for zabbix_server.conf to get more information about the variables.

diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh index 9606fdd2a..3860639ef 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -379,6 +379,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -387,6 +388,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -520,6 +522,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" @@ -543,6 +546,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh index 3c6ff76ae..beabcf071 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -379,6 +379,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -387,6 +388,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -520,6 +522,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" @@ -543,6 +546,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/server-pgsql/README.md b/Dockerfiles/server-pgsql/README.md index 6ec55ff55..b72245c89 100644 --- a/Dockerfiles/server-pgsql/README.md +++ b/Dockerfiles/server-pgsql/README.md @@ -140,6 +140,7 @@ ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.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 VAULT_TOKEN= # Available since 5.2.0 ZBX_LISTENIP= @@ -215,6 +216,9 @@ ZBX_TLSCIPHERCERT= # Available since 4.4.7 ZBX_TLSCIPHERCERT13= # Available since 4.4.7 ZBX_TLSCIPHERPSK= # Available since 4.4.7 ZBX_TLSCIPHERPSK13= # Available since 4.4.7 +ZBX_WEBDRIVERURL= # Available since 7.0.0 +ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0 + ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index c68e79710..511031ba2 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -395,6 +395,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -403,6 +404,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -540,6 +542,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" @@ -563,6 +566,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index c68e79710..511031ba2 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -395,6 +395,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -403,6 +404,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -540,6 +542,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" @@ -563,6 +566,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index c68e79710..511031ba2 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -395,6 +395,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -403,6 +404,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -540,6 +542,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" @@ -563,6 +566,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/server-pgsql/rhel/README.html b/Dockerfiles/server-pgsql/rhel/README.html index cc09cf2a7..4d47b8785 100644 --- a/Dockerfiles/server-pgsql/rhel/README.html +++ b/Dockerfiles/server-pgsql/rhel/README.html @@ -82,6 +82,7 @@ podman run --name some-zabbix-server-pgsql -e DB_SER ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_VAULTPREFIX= # Available since 7.0.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 @@ -158,6 +159,9 @@ podman run --name some-zabbix-server-pgsql -e DB_SER ZBX_TLSCIPHERCERT13= # Available since 4.4.7 ZBX_TLSCIPHERPSK= # Available since 4.4.7 ZBX_TLSCIPHERPSK13= # Available since 4.4.7 +ZBX_ALLOWSOFTWAREUPDATECHECK=1 # Available since 7.0.0 +ZBX_WEBDRIVERURL= # Available since 7.0.0 +ZBX_STARTBROWSERPOLLERS= # Available since 7.0.0

Default values of these variables are specified after equal sign.

The allowed variables are identical of parameters in official zabbix_server.conf. For example, ZBX_LOGSLOWQUERIES = LogSlowQueries.

Please use official documentation for zabbix_server.conf to get more information about the variables.

diff --git a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh index c68e79710..511031ba2 100755 --- a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh @@ -395,6 +395,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -403,6 +404,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -540,6 +542,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" @@ -563,6 +566,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index f6f6a4c19..e41e00380 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -395,6 +395,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" + update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" update_config_var $ZBX_CONFIG "DBPassword" @@ -403,6 +404,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" + update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" @@ -540,6 +542,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" @@ -563,6 +566,9 @@ update_zbx_config() { else update_config_var $ZBX_CONFIG "AllowRoot" "1" fi + + update_config_var $ZBX_CONFIG "WebDriverURL" "${ZBX_WEBDRIVERURL}" + update_config_var $ZBX_CONFIG "StartBrowserPollers" "${ZBX_STARTBROWSERPOLLERS}" } prepare_db() { diff --git a/env_vars/.env_prx b/env_vars/.env_prx index cb8d52cf8..ca35666ad 100644 --- a/env_vars/.env_prx +++ b/env_vars/.env_prx @@ -75,5 +75,8 @@ # ZBX_VAULTDBPATH= # ZBX_VAULTTLSCERTFILE= # Available since 6.2.0 # ZBX_VAULTTLSKEYFILE= # Available since 6.2.0 +# ZBX_VAULTPREFIX= # Available since 7.0.0 # ZBX_VAULTURL=https://127.0.0.1:8200 # VAULT_TOKEN= +# ZBX_WEBDRIVERURL= # Available since 7.0.0 +# ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0 diff --git a/env_vars/.env_srv b/env_vars/.env_srv index 098b0e1a0..9f67d4c49 100644 --- a/env_vars/.env_srv +++ b/env_vars/.env_srv @@ -78,7 +78,11 @@ ZBX_ENABLE_SNMP_TRAPS=true # ZBX_VAULTTLSCERTFILE= # Available since 6.2.0 # ZBX_VAULTTLSKEYFILE= # Available since 6.2.0 # ZBX_VAULTURL=https://127.0.0.1:8200 +# ZBX_VAULTPREFIX= # Available since 7.0.0 # VAULT_TOKEN= # ZBX_STARTREPORTWRITERS=0 # ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # ZBX_SERVICEMANAGERSYNCFREQUENCY=60 +# ZBX_ALLOWSOFTWAREUPDATECHECK=1 # Available since 7.0.0 +# ZBX_WEBDRIVERURL= # Available since 7.0.0 +# ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0