diff --git a/Dockerfiles/proxy-sqlite3/alpine/README.md b/Dockerfiles/proxy-sqlite3/alpine/README.md index 5587fd50b..a8cda7a7c 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/README.md +++ b/Dockerfiles/proxy-sqlite3/alpine/README.md @@ -119,9 +119,6 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat Additionally the image allows to specify many other environment variables listed below: ``` -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_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_SOURCEIP= diff --git a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh index 88c299747..2434bc981 100755 --- a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -148,14 +148,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword" - if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" - update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - else - update_config_var $ZBX_CONFIG "VaultDBPath" - update_config_var $ZBX_CONFIG "VaultURL" - fi - update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}" update_config_var $ZBX_CONFIG "ProxyOfflineBuffer" "${ZBX_PROXYOFFLINEBUFFER}" update_config_var $ZBX_CONFIG "HeartbeatFrequency" "${ZBX_PROXYHEARTBEATFREQUENCY}" diff --git a/Dockerfiles/proxy-sqlite3/centos/README.md b/Dockerfiles/proxy-sqlite3/centos/README.md index 5587fd50b..a8cda7a7c 100644 --- a/Dockerfiles/proxy-sqlite3/centos/README.md +++ b/Dockerfiles/proxy-sqlite3/centos/README.md @@ -119,9 +119,6 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat Additionally the image allows to specify many other environment variables listed below: ``` -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_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_SOURCEIP= diff --git a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh index 88c299747..2434bc981 100755 --- a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh @@ -148,14 +148,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword" - if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" - update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - else - update_config_var $ZBX_CONFIG "VaultDBPath" - update_config_var $ZBX_CONFIG "VaultURL" - fi - update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}" update_config_var $ZBX_CONFIG "ProxyOfflineBuffer" "${ZBX_PROXYOFFLINEBUFFER}" update_config_var $ZBX_CONFIG "HeartbeatFrequency" "${ZBX_PROXYHEARTBEATFREQUENCY}" diff --git a/Dockerfiles/proxy-sqlite3/ol/README.md b/Dockerfiles/proxy-sqlite3/ol/README.md index 5587fd50b..a8cda7a7c 100644 --- a/Dockerfiles/proxy-sqlite3/ol/README.md +++ b/Dockerfiles/proxy-sqlite3/ol/README.md @@ -119,9 +119,6 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat Additionally the image allows to specify many other environment variables listed below: ``` -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_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_SOURCEIP= diff --git a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh index 88c299747..2434bc981 100755 --- a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh @@ -148,14 +148,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword" - if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" - update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - else - update_config_var $ZBX_CONFIG "VaultDBPath" - update_config_var $ZBX_CONFIG "VaultURL" - fi - update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}" update_config_var $ZBX_CONFIG "ProxyOfflineBuffer" "${ZBX_PROXYOFFLINEBUFFER}" update_config_var $ZBX_CONFIG "HeartbeatFrequency" "${ZBX_PROXYHEARTBEATFREQUENCY}" diff --git a/Dockerfiles/proxy-sqlite3/rhel/README.md b/Dockerfiles/proxy-sqlite3/rhel/README.md index 5587fd50b..a8cda7a7c 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/README.md +++ b/Dockerfiles/proxy-sqlite3/rhel/README.md @@ -119,9 +119,6 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat Additionally the image allows to specify many other environment variables listed below: ``` -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_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_SOURCEIP= diff --git a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh index 88c299747..2434bc981 100755 --- a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh @@ -148,14 +148,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword" - if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" - update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - else - update_config_var $ZBX_CONFIG "VaultDBPath" - update_config_var $ZBX_CONFIG "VaultURL" - fi - update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}" update_config_var $ZBX_CONFIG "ProxyOfflineBuffer" "${ZBX_PROXYOFFLINEBUFFER}" update_config_var $ZBX_CONFIG "HeartbeatFrequency" "${ZBX_PROXYHEARTBEATFREQUENCY}" diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/README.md b/Dockerfiles/proxy-sqlite3/ubuntu/README.md index 5587fd50b..a8cda7a7c 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/README.md +++ b/Dockerfiles/proxy-sqlite3/ubuntu/README.md @@ -119,9 +119,6 @@ The variable enable communication with Zabbix Java Gateway to collect Java relat Additionally the image allows to specify many other environment variables listed below: ``` -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_ENABLEREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0 ZBX_SOURCEIP= diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh index 61bee51e7..ea7ca120b 100755 --- a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -148,14 +148,6 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword" - if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" - update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - else - update_config_var $ZBX_CONFIG "VaultDBPath" - update_config_var $ZBX_CONFIG "VaultURL" - fi - update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}" update_config_var $ZBX_CONFIG "ProxyOfflineBuffer" "${ZBX_PROXYOFFLINEBUFFER}" update_config_var $ZBX_CONFIG "HeartbeatFrequency" "${ZBX_PROXYHEARTBEATFREQUENCY}"