From 5a5bf88bc24ba03e109ca28ebb333af5d43810b0 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 17 Nov 2021 09:31:10 +0100 Subject: [PATCH] Added support for Zabbix HA --- Dockerfiles/server-mysql/alpine/README.md | 6 ++++++ .../server-mysql/alpine/docker-entrypoint.sh | 20 +++++++++++++++++++ Dockerfiles/server-mysql/centos/README.md | 6 ++++++ .../server-mysql/centos/docker-entrypoint.sh | 20 +++++++++++++++++++ Dockerfiles/server-mysql/ol/README.md | 6 ++++++ .../server-mysql/ol/docker-entrypoint.sh | 20 +++++++++++++++++++ Dockerfiles/server-mysql/rhel/README.md | 6 ++++++ .../server-mysql/rhel/docker-entrypoint.sh | 20 +++++++++++++++++++ Dockerfiles/server-mysql/ubuntu/README.md | 6 ++++++ .../server-mysql/ubuntu/docker-entrypoint.sh | 20 +++++++++++++++++++ Dockerfiles/server-pgsql/alpine/README.md | 5 +++++ .../server-pgsql/alpine/docker-entrypoint.sh | 20 +++++++++++++++++++ Dockerfiles/server-pgsql/centos/README.md | 5 +++++ .../server-pgsql/centos/docker-entrypoint.sh | 20 +++++++++++++++++++ Dockerfiles/server-pgsql/ol/README.md | 5 +++++ .../server-pgsql/ol/docker-entrypoint.sh | 20 +++++++++++++++++++ Dockerfiles/server-pgsql/ubuntu/README.md | 5 +++++ .../server-pgsql/ubuntu/docker-entrypoint.sh | 20 +++++++++++++++++++ .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../alpine/docker-entrypoint.sh | 2 -- .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../centos/docker-entrypoint.sh | 2 -- .../ol/conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../web-apache-mysql/ol/docker-entrypoint.sh | 2 -- .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../ubuntu/docker-entrypoint.sh | 2 -- .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../alpine/docker-entrypoint.sh | 2 -- .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../centos/docker-entrypoint.sh | 2 -- .../ol/conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../web-apache-pgsql/ol/docker-entrypoint.sh | 2 -- .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../ubuntu/docker-entrypoint.sh | 2 -- .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../alpine/docker-entrypoint.sh | 2 -- .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../centos/docker-entrypoint.sh | 2 -- .../ol/conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../web-nginx-mysql/ol/docker-entrypoint.sh | 2 -- .../rhel/conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../web-nginx-mysql/rhel/docker-entrypoint.sh | 2 -- .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../ubuntu/docker-entrypoint.sh | 2 -- .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../alpine/docker-entrypoint.sh | 2 -- .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../centos/docker-entrypoint.sh | 2 -- .../ol/conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../web-nginx-pgsql/ol/docker-entrypoint.sh | 2 -- .../conf/etc/zabbix/web/zabbix.conf.php | 6 ++++-- .../ubuntu/docker-entrypoint.sh | 2 -- env_vars/.env_prx | 1 + env_vars/.env_srv | 8 ++++++++ env_vars/.env_web | 2 +- 55 files changed, 308 insertions(+), 69 deletions(-) diff --git a/Dockerfiles/server-mysql/alpine/README.md b/Dockerfiles/server-mysql/alpine/README.md index 83d9930227..8468277eab 100644 --- a/Dockerfiles/server-mysql/alpine/README.md +++ b/Dockerfiles/server-mysql/alpine/README.md @@ -147,6 +147,7 @@ ZBX_LISTENIP= ZBX_LISTENBACKLOG= ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 +ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0 ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -175,13 +176,17 @@ ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 +ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 ZBX_SENDERFREQUENCY=30 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 +ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 ZBX_HANODENAME= # Available since 6.0.0 +ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 +ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 ZBX_NODEADDRESS=localhost # Available since 6.0.0 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M @@ -207,6 +212,7 @@ 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 + ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh index 7a1c02b4a0..868fba1210 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -400,6 +400,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" @@ -460,6 +461,25 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" + elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname)" + else + update_config_var $ZBX_CONFIG "HANodeName" "${ZBX_HANODENAME}" + fi + + : ${ZBX_NODEADDRESSPORT:="10051"} + if [ "${ZBX_AUTONODEADDRESS}" == 'fqdn' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname -f):${ZBX_NODEADDRESSPORT}" + elif [ "${ZBX_AUTONODEADDRESS}" == 'hostname' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname):${ZBX_NODEADDRESSPORT}" + else + update_config_var $ZBX_CONFIG "NodeAddress" "${ZBX_NODEADDRESS}" + fi + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-mysql/centos/README.md b/Dockerfiles/server-mysql/centos/README.md index 83d9930227..8468277eab 100644 --- a/Dockerfiles/server-mysql/centos/README.md +++ b/Dockerfiles/server-mysql/centos/README.md @@ -147,6 +147,7 @@ ZBX_LISTENIP= ZBX_LISTENBACKLOG= ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 +ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0 ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -175,13 +176,17 @@ ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 +ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 ZBX_SENDERFREQUENCY=30 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 +ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 ZBX_HANODENAME= # Available since 6.0.0 +ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 +ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 ZBX_NODEADDRESS=localhost # Available since 6.0.0 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M @@ -207,6 +212,7 @@ 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 + ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh index e5147abd77..4b494e58a5 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -397,6 +397,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" @@ -457,6 +458,25 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" + elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname)" + else + update_config_var $ZBX_CONFIG "HANodeName" "${ZBX_HANODENAME}" + fi + + : ${ZBX_NODEADDRESSPORT:="10051"} + if [ "${ZBX_AUTONODEADDRESS}" == 'fqdn' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname -f):${ZBX_NODEADDRESSPORT}" + elif [ "${ZBX_AUTONODEADDRESS}" == 'hostname' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname):${ZBX_NODEADDRESSPORT}" + else + update_config_var $ZBX_CONFIG "NodeAddress" "${ZBX_NODEADDRESS}" + fi + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-mysql/ol/README.md b/Dockerfiles/server-mysql/ol/README.md index 83d9930227..8468277eab 100644 --- a/Dockerfiles/server-mysql/ol/README.md +++ b/Dockerfiles/server-mysql/ol/README.md @@ -147,6 +147,7 @@ ZBX_LISTENIP= ZBX_LISTENBACKLOG= ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 +ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0 ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -175,13 +176,17 @@ ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 +ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 ZBX_SENDERFREQUENCY=30 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 +ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 ZBX_HANODENAME= # Available since 6.0.0 +ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 +ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 ZBX_NODEADDRESS=localhost # Available since 6.0.0 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M @@ -207,6 +212,7 @@ 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 + ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh index e5147abd77..4b494e58a5 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -397,6 +397,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" @@ -457,6 +458,25 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" + elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname)" + else + update_config_var $ZBX_CONFIG "HANodeName" "${ZBX_HANODENAME}" + fi + + : ${ZBX_NODEADDRESSPORT:="10051"} + if [ "${ZBX_AUTONODEADDRESS}" == 'fqdn' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname -f):${ZBX_NODEADDRESSPORT}" + elif [ "${ZBX_AUTONODEADDRESS}" == 'hostname' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname):${ZBX_NODEADDRESSPORT}" + else + update_config_var $ZBX_CONFIG "NodeAddress" "${ZBX_NODEADDRESS}" + fi + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-mysql/rhel/README.md b/Dockerfiles/server-mysql/rhel/README.md index 83d9930227..8468277eab 100644 --- a/Dockerfiles/server-mysql/rhel/README.md +++ b/Dockerfiles/server-mysql/rhel/README.md @@ -147,6 +147,7 @@ ZBX_LISTENIP= ZBX_LISTENBACKLOG= ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 +ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0 ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -175,13 +176,17 @@ ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 +ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 ZBX_SENDERFREQUENCY=30 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 +ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 ZBX_HANODENAME= # Available since 6.0.0 +ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 +ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 ZBX_NODEADDRESS=localhost # Available since 6.0.0 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M @@ -207,6 +212,7 @@ 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 + ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh index e5147abd77..4b494e58a5 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -397,6 +397,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" @@ -457,6 +458,25 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" + elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname)" + else + update_config_var $ZBX_CONFIG "HANodeName" "${ZBX_HANODENAME}" + fi + + : ${ZBX_NODEADDRESSPORT:="10051"} + if [ "${ZBX_AUTONODEADDRESS}" == 'fqdn' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname -f):${ZBX_NODEADDRESSPORT}" + elif [ "${ZBX_AUTONODEADDRESS}" == 'hostname' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname):${ZBX_NODEADDRESSPORT}" + else + update_config_var $ZBX_CONFIG "NodeAddress" "${ZBX_NODEADDRESS}" + fi + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-mysql/ubuntu/README.md b/Dockerfiles/server-mysql/ubuntu/README.md index 83d9930227..8468277eab 100644 --- a/Dockerfiles/server-mysql/ubuntu/README.md +++ b/Dockerfiles/server-mysql/ubuntu/README.md @@ -147,6 +147,7 @@ ZBX_LISTENIP= ZBX_LISTENBACKLOG= ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 +ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0 ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -175,13 +176,17 @@ ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 +ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 ZBX_SENDERFREQUENCY=30 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 +ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 ZBX_HANODENAME= # Available since 6.0.0 +ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 +ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 ZBX_NODEADDRESS=localhost # Available since 6.0.0 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M @@ -207,6 +212,7 @@ 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 + ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh index 1c01cac3da..2e60b8c680 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -397,6 +397,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" @@ -457,6 +458,25 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" + elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname)" + else + update_config_var $ZBX_CONFIG "HANodeName" "${ZBX_HANODENAME}" + fi + + : ${ZBX_NODEADDRESSPORT:="10051"} + if [ "${ZBX_AUTONODEADDRESS}" == 'fqdn' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname -f):${ZBX_NODEADDRESSPORT}" + elif [ "${ZBX_AUTONODEADDRESS}" == 'hostname' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname):${ZBX_NODEADDRESSPORT}" + else + update_config_var $ZBX_CONFIG "NodeAddress" "${ZBX_NODEADDRESS}" + fi + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-pgsql/alpine/README.md b/Dockerfiles/server-pgsql/alpine/README.md index 936234a82c..2c750aadcc 100644 --- a/Dockerfiles/server-pgsql/alpine/README.md +++ b/Dockerfiles/server-pgsql/alpine/README.md @@ -148,6 +148,7 @@ ZBX_LISTENIP= ZBX_LISTENBACKLOG= ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 +ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0 ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -176,13 +177,17 @@ ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 +ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 ZBX_SENDERFREQUENCY=30 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 +ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 ZBX_HANODENAME= # Available since 6.0.0 +ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 +ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 ZBX_NODEADDRESS=localhost # Available since 6.0.0 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index 69ad0d4ef5..b84e846073 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -437,6 +437,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" @@ -497,6 +498,25 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" + elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname)" + else + update_config_var $ZBX_CONFIG "HANodeName" "${ZBX_HANODENAME}" + fi + + : ${ZBX_NODEADDRESSPORT:="10051"} + if [ "${ZBX_AUTONODEADDRESS}" == 'fqdn' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname -f):${ZBX_NODEADDRESSPORT}" + elif [ "${ZBX_AUTONODEADDRESS}" == 'hostname' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname):${ZBX_NODEADDRESSPORT}" + else + update_config_var $ZBX_CONFIG "NodeAddress" "${ZBX_NODEADDRESS}" + fi + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-pgsql/centos/README.md b/Dockerfiles/server-pgsql/centos/README.md index 936234a82c..2c750aadcc 100644 --- a/Dockerfiles/server-pgsql/centos/README.md +++ b/Dockerfiles/server-pgsql/centos/README.md @@ -148,6 +148,7 @@ ZBX_LISTENIP= ZBX_LISTENBACKLOG= ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 +ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0 ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -176,13 +177,17 @@ ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 +ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 ZBX_SENDERFREQUENCY=30 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 +ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 ZBX_HANODENAME= # Available since 6.0.0 +ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 +ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 ZBX_NODEADDRESS=localhost # Available since 6.0.0 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index 69ad0d4ef5..b84e846073 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -437,6 +437,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" @@ -497,6 +498,25 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" + elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname)" + else + update_config_var $ZBX_CONFIG "HANodeName" "${ZBX_HANODENAME}" + fi + + : ${ZBX_NODEADDRESSPORT:="10051"} + if [ "${ZBX_AUTONODEADDRESS}" == 'fqdn' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname -f):${ZBX_NODEADDRESSPORT}" + elif [ "${ZBX_AUTONODEADDRESS}" == 'hostname' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname):${ZBX_NODEADDRESSPORT}" + else + update_config_var $ZBX_CONFIG "NodeAddress" "${ZBX_NODEADDRESS}" + fi + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-pgsql/ol/README.md b/Dockerfiles/server-pgsql/ol/README.md index 936234a82c..2c750aadcc 100644 --- a/Dockerfiles/server-pgsql/ol/README.md +++ b/Dockerfiles/server-pgsql/ol/README.md @@ -148,6 +148,7 @@ ZBX_LISTENIP= ZBX_LISTENBACKLOG= ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 +ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0 ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -176,13 +177,17 @@ ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 +ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 ZBX_SENDERFREQUENCY=30 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 +ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 ZBX_HANODENAME= # Available since 6.0.0 +ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 +ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 ZBX_NODEADDRESS=localhost # Available since 6.0.0 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index 69ad0d4ef5..b84e846073 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -437,6 +437,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" @@ -497,6 +498,25 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" + elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname)" + else + update_config_var $ZBX_CONFIG "HANodeName" "${ZBX_HANODENAME}" + fi + + : ${ZBX_NODEADDRESSPORT:="10051"} + if [ "${ZBX_AUTONODEADDRESS}" == 'fqdn' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname -f):${ZBX_NODEADDRESSPORT}" + elif [ "${ZBX_AUTONODEADDRESS}" == 'hostname' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname):${ZBX_NODEADDRESSPORT}" + else + update_config_var $ZBX_CONFIG "NodeAddress" "${ZBX_NODEADDRESS}" + fi + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-pgsql/ubuntu/README.md b/Dockerfiles/server-pgsql/ubuntu/README.md index 936234a82c..2c750aadcc 100644 --- a/Dockerfiles/server-pgsql/ubuntu/README.md +++ b/Dockerfiles/server-pgsql/ubuntu/README.md @@ -148,6 +148,7 @@ ZBX_LISTENIP= ZBX_LISTENBACKLOG= ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0 ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0 +ZBX_SERVICEMANAGERSYNCFREQUENCY=60 # Available since 6.0.0 ZBX_HISTORYSTORAGEURL= # Available since 3.4.0 ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0 ZBX_STARTPOLLERS=5 @@ -176,13 +177,17 @@ ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 +ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 ZBX_SENDERFREQUENCY=30 ZBX_CACHESIZE=8M ZBX_CACHEUPDATEFREQUENCY=60 ZBX_STARTDBSYNCERS=4 ZBX_EXPORTFILESIZE=1G # Available since 4.0.0 ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6 +ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 ZBX_HANODENAME= # Available since 6.0.0 +ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 +ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 ZBX_NODEADDRESS=localhost # Available since 6.0.0 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index 7ee209029b..9dd9fecafd 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -437,6 +437,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}" @@ -497,6 +498,25 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" + + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" + elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then + update_config_var $ZBX_CONFIG "HANodeName" "$(hostname)" + else + update_config_var $ZBX_CONFIG "HANodeName" "${ZBX_HANODENAME}" + fi + + : ${ZBX_NODEADDRESSPORT:="10051"} + if [ "${ZBX_AUTONODEADDRESS}" == 'fqdn' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname -f):${ZBX_NODEADDRESSPORT}" + elif [ "${ZBX_AUTONODEADDRESS}" == 'hostname' ] && [ ! -n "${ZBX_NODEADDRESS}" ]; then + update_config_var $ZBX_CONFIG "NodeAddress" "$(hostname):${ZBX_NODEADDRESSPORT}" + else + update_config_var $ZBX_CONFIG "NodeAddress" "${ZBX_NODEADDRESS}" + fi + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh index d4bcab3192..1bcbe8291e 100755 --- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh index dc425ca0a5..4b9cea9f0b 100755 --- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh index dc425ca0a5..4b9cea9f0b 100755 --- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh index 1ed2b1002f..02bb119b68 100755 --- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh index 85875a457f..ff9be43641 100755 --- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh index 63936496db..68e0475dc2 100755 --- a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh index 63936496db..68e0475dc2 100755 --- a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 9257e476e7..364620e34a 100755 --- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index cd7fc31ca6..ff8328d4b3 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh index bbd9e50805..36efaa1368 100755 --- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh index bbd9e50805..36efaa1368 100755 --- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh index 2acef975ab..d41425c2a8 100755 --- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 0008cc14d8..c84414adc4 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh index a2ebfadafb..9a732c72f6 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh index e0e6e8a217..f671a6a6e2 100755 --- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh index e0e6e8a217..f671a6a6e2 100755 --- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index 2b667eb010..efa8ac8497 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -12,8 +12,10 @@ // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); -$ZBX_SERVER = getenv('ZBX_SERVER_HOST'); -$ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +if (getenv('ZBX_SERVER_HOST')) { + $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); + $ZBX_SERVER_PORT = getenv('ZBX_SERVER_PORT'); +} $ZBX_SERVER_NAME = getenv('ZBX_SERVER_NAME'); // Used for TLS connection. diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 1d578ff9bf..1ef73a7123 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -12,8 +12,6 @@ fi # Default Zabbix installation name # Used only by Zabbix web-interface : ${ZBX_SERVER_NAME:="Zabbix docker"} -# Default Zabbix server host -: ${ZBX_SERVER_HOST:="zabbix-server"} # Default Zabbix server port number : ${ZBX_SERVER_PORT:="10051"} diff --git a/env_vars/.env_prx b/env_vars/.env_prx index d67c1201d4..2f9777f42a 100644 --- a/env_vars/.env_prx +++ b/env_vars/.env_prx @@ -6,6 +6,7 @@ # ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0 # ZBX_HOSTNAMEITEM=system.hostname # ZBX_SOURCEIP= +# ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0 # ZBX_DBTLSCONNECT=require # Available since 5.0.0 # ZBX_DBTLSCAFILE=/run/secrets/root-ca.pem # Available since 5.0.0 # ZBX_DBTLSCERTFILE=/run/secrets/client-cert.pem # Available since 5.0.0 diff --git a/env_vars/.env_srv b/env_vars/.env_srv index edd7ba8988..d780bce2dd 100644 --- a/env_vars/.env_srv +++ b/env_vars/.env_srv @@ -2,12 +2,18 @@ # ZBX_LISTENBACKLOG= # ZBX_HISTORYSTORAGEURL=http://elasticsearch:9200/ # Available since 3.4.5 # ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.5 +# ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0 # ZBX_DBTLSCONNECT=required # Available since 5.0.0 # ZBX_DBTLSCAFILE=/run/secrets/root-ca.pem # Available since 5.0.0 # ZBX_DBTLSCERTFILE=/run/secrets/client-cert.pem # Available since 5.0.0 # ZBX_DBTLSKEYFILE=/run/secrets/client-key.pem # Available since 5.0.0 # ZBX_DBTLSCIPHER= # Available since 5.0.0 # ZBX_DBTLSCIPHER13= # Available since 5.0.0 +# ZBX_AUTOHANODENAME=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 +# ZBX_HANODENAME= # Available since 6.0.0 +# ZBX_AUTONODEADDRESS=fqdn # Allowed values: fqdn, hostname. Available since 6.0.0 +# ZBX_NODEADDRESSPORT=10051 # Allowed to use with ZBX_AUTONODEADDRESS variable only. Available since 6.0.0 +# ZBX_NODEADDRESS=localhost:10051 # Available since 6.0.0 # ZBX_DEBUGLEVEL=3 # ZBX_STARTPOLLERS=5 # ZBX_IPMIPOLLERS=0 @@ -33,6 +39,7 @@ ZBX_ENABLE_SNMP_TRAPS=true # ZBX_SOURCEIP= # ZBX_HOUSEKEEPINGFREQUENCY=1 # ZBX_MAXHOUSEKEEPERDELETE=5000 +# ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # ZBX_SENDERFREQUENCY=30 # ZBX_CACHESIZE=8M # ZBX_CACHEUPDATEFREQUENCY=60 @@ -62,3 +69,4 @@ ZBX_ENABLE_SNMP_TRAPS=true # VAULT_TOKEN= # ZBX_STARTREPORTWRITERS=0 # ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report +# ZBX_SERVICEMANAGERSYNCFREQUENCY=60 diff --git a/env_vars/.env_web b/env_vars/.env_web index ae96d1ad26..155e7f58ff 100644 --- a/env_vars/.env_web +++ b/env_vars/.env_web @@ -1,4 +1,4 @@ -# ZBX_SERVER_HOST=zabbix-server +ZBX_SERVER_HOST=zabbix-server # ZBX_SERVER_PORT=10051 ZBX_SERVER_NAME=Composed installation # ZBX_DB_ENCRYPTION=true # Available since 5.0.0