diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md index 027b651c12..10168e2296 100644 --- a/Dockerfiles/server-mysql/README.md +++ b/Dockerfiles/server-mysql/README.md @@ -177,6 +177,7 @@ ZBX_VMWARECACHESIZE=8M ZBX_VMWARETIMEOUT=10 ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= +ZBX_SMSDEVICES= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh index a15d8a88a7..83154dcb5b 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -527,6 +527,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh index 3860639ef2..f444684666 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -524,6 +524,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh index 3860639ef2..f444684666 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -524,6 +524,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then diff --git a/Dockerfiles/server-mysql/rhel/README.html b/Dockerfiles/server-mysql/rhel/README.html index fee69ce846..5e013c711e 100644 --- a/Dockerfiles/server-mysql/rhel/README.html +++ b/Dockerfiles/server-mysql/rhel/README.html @@ -121,6 +121,7 @@

Other variables

ZBX_VMWARETIMEOUT=10 ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= +ZBX_SMSDEVICES= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh index 3860639ef2..f444684666 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -524,6 +524,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh index beabcf0715..4675a05bf5 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -524,6 +524,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then diff --git a/Dockerfiles/server-pgsql/README.md b/Dockerfiles/server-pgsql/README.md index 0642d3465a..4a5e131187 100644 --- a/Dockerfiles/server-pgsql/README.md +++ b/Dockerfiles/server-pgsql/README.md @@ -178,6 +178,7 @@ ZBX_VMWARECACHESIZE=8M ZBX_VMWARETIMEOUT=10 ZBX_ENABLE_SNMP_TRAPS=false ZBX_SOURCEIP= +ZBX_SMSDEVICES= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60 # Available since 6.0.0 @@ -218,7 +219,6 @@ ZBX_TLSCIPHERPSK= # Available since 4.4.7 ZBX_TLSCIPHERPSK13= # Available since 4.4.7 ZBX_WEBDRIVERURL= # Available since 7.0.0 ZBX_STARTBROWSERPOLLERS=1 # Available since 7.0.0 - ``` Default values of these variables are specified after equal sign. diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index 511031ba26..5d3e1d6133 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -544,6 +544,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index 511031ba26..5d3e1d6133 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -544,6 +544,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index 511031ba26..5d3e1d6133 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -544,6 +544,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then diff --git a/Dockerfiles/server-pgsql/rhel/README.html b/Dockerfiles/server-pgsql/rhel/README.html index 4d47b8785b..02c3312453 100644 --- a/Dockerfiles/server-pgsql/rhel/README.html +++ b/Dockerfiles/server-pgsql/rhel/README.html @@ -120,6 +120,7 @@

Other variables

ZBX_VMWARECACHESIZE=8M ZBX_VMWARETIMEOUT=10 ZBX_ENABLE_SNMP_TRAPS=false +ZBX_SMSDEVICES= ZBX_SOURCEIP= ZBX_HOUSEKEEPINGFREQUENCY=1 ZBX_MAXHOUSEKEEPERDELETE=5000 diff --git a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh index 511031ba26..5d3e1d6133 100755 --- a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh @@ -544,6 +544,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index e41e00380f..fff2ba0b36 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -544,6 +544,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ServiceManagerSyncFrequency" "${ZBX_SERVICEMANAGERSYNCFREQUENCY}" update_config_var $ZBX_CONFIG "AllowSoftwareUpdateCheck" "${ZBX_ALLOWSOFTWAREUPDATECHECK}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "${ZBX_AUTOHANODENAME}" == 'fqdn' ] && [ ! -n "${ZBX_HANODENAME}" ]; then update_config_var $ZBX_CONFIG "HANodeName" "$(hostname -f)" elif [ "${ZBX_AUTOHANODENAME}" == 'hostname' ] && [ ! -n "${ZBX_HANODENAME}" ]; then diff --git a/env_vars/.env_srv b/env_vars/.env_srv index 263e0f3088..ba6a281fd5 100644 --- a/env_vars/.env_srv +++ b/env_vars/.env_srv @@ -46,6 +46,7 @@ ZBX_STARTJAVAPOLLERS=5 # ZBX_VMWARETIMEOUT=10 ZBX_ENABLE_SNMP_TRAPS=true # ZBX_SOURCEIP= +# ZBX_SMSDEVICES= # ZBX_HOUSEKEEPINGFREQUENCY=1 # ZBX_MAXHOUSEKEEPERDELETE=5000 # ZBX_PROBLEMHOUSEKEEPINGFREQUENCY=60