From 36290aa92cdc8171047c67e5d15ed0a5fbedd260 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 11 Sep 2020 10:25:00 -0400 Subject: [PATCH 1/3] Zabbix web-interface maintenance mode support (docs) --- web-apache-mysql/alpine/README.md | 12 ++++++++++++ web-apache-mysql/centos/README.md | 12 ++++++++++++ web-apache-mysql/ubuntu/README.md | 12 ++++++++++++ web-apache-pgsql/alpine/README.md | 12 ++++++++++++ web-apache-pgsql/centos/README.md | 12 ++++++++++++ web-apache-pgsql/ubuntu/README.md | 12 ++++++++++++ web-nginx-mysql/alpine/README.md | 12 ++++++++++++ web-nginx-mysql/centos/README.md | 12 ++++++++++++ web-nginx-mysql/ubuntu/README.md | 12 ++++++++++++ web-nginx-pgsql/alpine/README.md | 12 ++++++++++++ web-nginx-pgsql/centos/README.md | 12 ++++++++++++ web-nginx-pgsql/ubuntu/README.md | 12 ++++++++++++ 12 files changed, 144 insertions(+) diff --git a/web-apache-mysql/alpine/README.md b/web-apache-mysql/alpine/README.md index 762097c76..bd7f31527 100644 --- a/web-apache-mysql/alpine/README.md +++ b/web-apache-mysql/alpine/README.md @@ -162,6 +162,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. diff --git a/web-apache-mysql/centos/README.md b/web-apache-mysql/centos/README.md index 762097c76..bd7f31527 100644 --- a/web-apache-mysql/centos/README.md +++ b/web-apache-mysql/centos/README.md @@ -162,6 +162,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. diff --git a/web-apache-mysql/ubuntu/README.md b/web-apache-mysql/ubuntu/README.md index 762097c76..bd7f31527 100644 --- a/web-apache-mysql/ubuntu/README.md +++ b/web-apache-mysql/ubuntu/README.md @@ -162,6 +162,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. diff --git a/web-apache-pgsql/alpine/README.md b/web-apache-pgsql/alpine/README.md index fcd67454a..91df66487 100644 --- a/web-apache-pgsql/alpine/README.md +++ b/web-apache-pgsql/alpine/README.md @@ -160,6 +160,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. diff --git a/web-apache-pgsql/centos/README.md b/web-apache-pgsql/centos/README.md index fcd67454a..91df66487 100644 --- a/web-apache-pgsql/centos/README.md +++ b/web-apache-pgsql/centos/README.md @@ -160,6 +160,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. diff --git a/web-apache-pgsql/ubuntu/README.md b/web-apache-pgsql/ubuntu/README.md index fcd67454a..91df66487 100644 --- a/web-apache-pgsql/ubuntu/README.md +++ b/web-apache-pgsql/ubuntu/README.md @@ -160,6 +160,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. diff --git a/web-nginx-mysql/alpine/README.md b/web-nginx-mysql/alpine/README.md index 5d3d2328f..8d7a72ff1 100644 --- a/web-nginx-mysql/alpine/README.md +++ b/web-nginx-mysql/alpine/README.md @@ -163,6 +163,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. diff --git a/web-nginx-mysql/centos/README.md b/web-nginx-mysql/centos/README.md index 5d3d2328f..8d7a72ff1 100644 --- a/web-nginx-mysql/centos/README.md +++ b/web-nginx-mysql/centos/README.md @@ -163,6 +163,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. diff --git a/web-nginx-mysql/ubuntu/README.md b/web-nginx-mysql/ubuntu/README.md index 5d3d2328f..8d7a72ff1 100644 --- a/web-nginx-mysql/ubuntu/README.md +++ b/web-nginx-mysql/ubuntu/README.md @@ -163,6 +163,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. diff --git a/web-nginx-pgsql/alpine/README.md b/web-nginx-pgsql/alpine/README.md index 7a133cc2e..3139141c5 100644 --- a/web-nginx-pgsql/alpine/README.md +++ b/web-nginx-pgsql/alpine/README.md @@ -160,6 +160,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. diff --git a/web-nginx-pgsql/centos/README.md b/web-nginx-pgsql/centos/README.md index 7a133cc2e..3139141c5 100644 --- a/web-nginx-pgsql/centos/README.md +++ b/web-nginx-pgsql/centos/README.md @@ -160,6 +160,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. diff --git a/web-nginx-pgsql/ubuntu/README.md b/web-nginx-pgsql/ubuntu/README.md index 7a133cc2e..3139141c5 100644 --- a/web-nginx-pgsql/ubuntu/README.md +++ b/web-nginx-pgsql/ubuntu/README.md @@ -160,6 +160,18 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`. The varable is PHP ``max_input_time`` option. By default, value is `300`. +### `ZBX_DENY_GUI_ACCESS` + +Enable (``true``) maintenance mode for Zabbix web-interface. + +### `ZBX_GUI_ACCESS_IP_RANGE` + +Array of IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. + +### `ZBX_GUI_WARNING_MSG` + +Information message about maintenance period for Zabbix web-interface. + ### `ZBX_DB_ENCRYPTION` The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default. From 4273d28352099d962d04bb80ee4927d0c6f0689c Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 25 Sep 2020 12:25:27 +0300 Subject: [PATCH 2/3] Removed duplicated package from agent alpine --- agent/alpine/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 478175f4b..20d28944a 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -51,8 +51,7 @@ RUN set -eux && \ g++ \ pcre-dev \ make \ - git \ - coreutils && \ + git && \ cd /tmp/ && \ git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \ cd /tmp/zabbix-${ZBX_VERSION} && \ From 4f52bab33eaff74867a4317666711a4dfc08351d Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 8 Oct 2020 05:11:55 -0400 Subject: [PATCH 3/3] Added Vault feature support --- proxy-mysql/alpine/README.md | 3 +++ proxy-mysql/centos/README.md | 3 +++ proxy-mysql/ubuntu/README.md | 3 +++ proxy-sqlite3/alpine/README.md | 3 +++ proxy-sqlite3/centos/README.md | 3 +++ proxy-sqlite3/ubuntu/README.md | 3 +++ server-mysql/alpine/README.md | 3 +++ server-mysql/centos/README.md | 3 +++ server-mysql/ubuntu/README.md | 3 +++ server-pgsql/alpine/README.md | 3 +++ server-pgsql/centos/README.md | 3 +++ server-pgsql/ubuntu/README.md | 3 +++ web-apache-mysql/alpine/README.md | 10 ++++++++++ web-apache-mysql/centos/README.md | 10 ++++++++++ web-apache-mysql/ubuntu/README.md | 10 ++++++++++ web-apache-pgsql/alpine/README.md | 10 ++++++++++ web-apache-pgsql/centos/README.md | 10 ++++++++++ web-apache-pgsql/ubuntu/README.md | 10 ++++++++++ web-nginx-mysql/alpine/README.md | 10 ++++++++++ web-nginx-mysql/centos/README.md | 10 ++++++++++ web-nginx-mysql/ubuntu/README.md | 10 ++++++++++ web-nginx-pgsql/alpine/README.md | 10 ++++++++++ web-nginx-pgsql/centos/README.md | 10 ++++++++++ web-nginx-pgsql/ubuntu/README.md | 10 ++++++++++ 24 files changed, 156 insertions(+) diff --git a/proxy-mysql/alpine/README.md b/proxy-mysql/alpine/README.md index 7a8fd29f0..5ede7bda2 100644 --- a/proxy-mysql/alpine/README.md +++ b/proxy-mysql/alpine/README.md @@ -165,6 +165,9 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0 ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_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_HOSTNAMEITEM=system.hostname diff --git a/proxy-mysql/centos/README.md b/proxy-mysql/centos/README.md index 7a8fd29f0..5ede7bda2 100644 --- a/proxy-mysql/centos/README.md +++ b/proxy-mysql/centos/README.md @@ -165,6 +165,9 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0 ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_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_HOSTNAMEITEM=system.hostname diff --git a/proxy-mysql/ubuntu/README.md b/proxy-mysql/ubuntu/README.md index 7a8fd29f0..5ede7bda2 100644 --- a/proxy-mysql/ubuntu/README.md +++ b/proxy-mysql/ubuntu/README.md @@ -165,6 +165,9 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0 ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_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_HOSTNAMEITEM=system.hostname diff --git a/proxy-sqlite3/alpine/README.md b/proxy-sqlite3/alpine/README.md index 77c514388..bca43ec32 100644 --- a/proxy-sqlite3/alpine/README.md +++ b/proxy-sqlite3/alpine/README.md @@ -123,6 +123,9 @@ 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/proxy-sqlite3/centos/README.md b/proxy-sqlite3/centos/README.md index 77c514388..bca43ec32 100644 --- a/proxy-sqlite3/centos/README.md +++ b/proxy-sqlite3/centos/README.md @@ -123,6 +123,9 @@ 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/proxy-sqlite3/ubuntu/README.md b/proxy-sqlite3/ubuntu/README.md index 77c514388..bca43ec32 100644 --- a/proxy-sqlite3/ubuntu/README.md +++ b/proxy-sqlite3/ubuntu/README.md @@ -123,6 +123,9 @@ 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/server-mysql/alpine/README.md b/server-mysql/alpine/README.md index 060b0fe15..2f3b5df39 100644 --- a/server-mysql/alpine/README.md +++ b/server-mysql/alpine/README.md @@ -135,6 +135,9 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0 ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_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_LISTENIP= ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 diff --git a/server-mysql/centos/README.md b/server-mysql/centos/README.md index 060b0fe15..2f3b5df39 100644 --- a/server-mysql/centos/README.md +++ b/server-mysql/centos/README.md @@ -135,6 +135,9 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0 ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_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_LISTENIP= ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 diff --git a/server-mysql/ubuntu/README.md b/server-mysql/ubuntu/README.md index 060b0fe15..2f3b5df39 100644 --- a/server-mysql/ubuntu/README.md +++ b/server-mysql/ubuntu/README.md @@ -135,6 +135,9 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0 ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_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_LISTENIP= ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 diff --git a/server-pgsql/alpine/README.md b/server-pgsql/alpine/README.md index 86c81e21a..f883a74df 100644 --- a/server-pgsql/alpine/README.md +++ b/server-pgsql/alpine/README.md @@ -132,6 +132,9 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0 ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_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_LISTENIP= ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 diff --git a/server-pgsql/centos/README.md b/server-pgsql/centos/README.md index 86c81e21a..f883a74df 100644 --- a/server-pgsql/centos/README.md +++ b/server-pgsql/centos/README.md @@ -132,6 +132,9 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0 ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_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_LISTENIP= ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 diff --git a/server-pgsql/ubuntu/README.md b/server-pgsql/ubuntu/README.md index 86c81e21a..f883a74df 100644 --- a/server-pgsql/ubuntu/README.md +++ b/server-pgsql/ubuntu/README.md @@ -132,6 +132,9 @@ ZBX_DBTLSCERTFILE= # Available since 5.0.0 ZBX_DBTLSKEYFILE= # Available since 5.0.0 ZBX_DBTLSCIPHER= # Available since 5.0.0 ZBX_DBTLSCIPHER13= # Available since 5.0.0 +ZBX_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_LISTENIP= ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 diff --git a/web-apache-mysql/alpine/README.md b/web-apache-mysql/alpine/README.md index bd7f31527..9209782d3 100644 --- a/web-apache-mysql/alpine/README.md +++ b/web-apache-mysql/alpine/README.md @@ -202,6 +202,16 @@ The variable allows to specify a custom list of valid ciphers. The format of the The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` diff --git a/web-apache-mysql/centos/README.md b/web-apache-mysql/centos/README.md index bd7f31527..9209782d3 100644 --- a/web-apache-mysql/centos/README.md +++ b/web-apache-mysql/centos/README.md @@ -202,6 +202,16 @@ The variable allows to specify a custom list of valid ciphers. The format of the The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` diff --git a/web-apache-mysql/ubuntu/README.md b/web-apache-mysql/ubuntu/README.md index bd7f31527..9209782d3 100644 --- a/web-apache-mysql/ubuntu/README.md +++ b/web-apache-mysql/ubuntu/README.md @@ -202,6 +202,16 @@ The variable allows to specify a custom list of valid ciphers. The format of the The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` diff --git a/web-apache-pgsql/alpine/README.md b/web-apache-pgsql/alpine/README.md index 91df66487..33fc92b45 100644 --- a/web-apache-pgsql/alpine/README.md +++ b/web-apache-pgsql/alpine/README.md @@ -196,6 +196,16 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` diff --git a/web-apache-pgsql/centos/README.md b/web-apache-pgsql/centos/README.md index 91df66487..33fc92b45 100644 --- a/web-apache-pgsql/centos/README.md +++ b/web-apache-pgsql/centos/README.md @@ -196,6 +196,16 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` diff --git a/web-apache-pgsql/ubuntu/README.md b/web-apache-pgsql/ubuntu/README.md index 91df66487..33fc92b45 100644 --- a/web-apache-pgsql/ubuntu/README.md +++ b/web-apache-pgsql/ubuntu/README.md @@ -196,6 +196,16 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/apache2`` diff --git a/web-nginx-mysql/alpine/README.md b/web-nginx-mysql/alpine/README.md index 8d7a72ff1..45024dcff 100644 --- a/web-nginx-mysql/alpine/README.md +++ b/web-nginx-mysql/alpine/README.md @@ -203,6 +203,16 @@ The variable allows to specify a custom list of valid ciphers. The format of the The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx`` diff --git a/web-nginx-mysql/centos/README.md b/web-nginx-mysql/centos/README.md index 8d7a72ff1..45024dcff 100644 --- a/web-nginx-mysql/centos/README.md +++ b/web-nginx-mysql/centos/README.md @@ -203,6 +203,16 @@ The variable allows to specify a custom list of valid ciphers. The format of the The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx`` diff --git a/web-nginx-mysql/ubuntu/README.md b/web-nginx-mysql/ubuntu/README.md index 8d7a72ff1..45024dcff 100644 --- a/web-nginx-mysql/ubuntu/README.md +++ b/web-nginx-mysql/ubuntu/README.md @@ -203,6 +203,16 @@ The variable allows to specify a custom list of valid ciphers. The format of the The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx`` diff --git a/web-nginx-pgsql/alpine/README.md b/web-nginx-pgsql/alpine/README.md index 3139141c5..2b40b9f97 100644 --- a/web-nginx-pgsql/alpine/README.md +++ b/web-nginx-pgsql/alpine/README.md @@ -196,6 +196,16 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx`` diff --git a/web-nginx-pgsql/centos/README.md b/web-nginx-pgsql/centos/README.md index 3139141c5..2b40b9f97 100644 --- a/web-nginx-pgsql/centos/README.md +++ b/web-nginx-pgsql/centos/README.md @@ -196,6 +196,16 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx`` diff --git a/web-nginx-pgsql/ubuntu/README.md b/web-nginx-pgsql/ubuntu/README.md index 3139141c5..2b40b9f97 100644 --- a/web-nginx-pgsql/ubuntu/README.md +++ b/web-nginx-pgsql/ubuntu/README.md @@ -196,6 +196,16 @@ The variable allows to activate host verification. Available since 5.0.0. The variable allows to specify custom SSO settings in JSON format. Available since 5.0.0. +### Other variables + +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 +``` + ## Allowed volumes for the Zabbix web interface container ### ``/etc/ssl/nginx``