From 40248ff97ffeeae6a6807912e75757ab3dbba43d Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 29 May 2024 15:54:52 +0900 Subject: [PATCH] Added SMSDevices for server images --- Dockerfiles/server-mysql/README.md | 1 + Dockerfiles/server-mysql/alpine/docker-entrypoint.sh | 2 ++ Dockerfiles/server-mysql/centos/docker-entrypoint.sh | 2 ++ Dockerfiles/server-mysql/ol/docker-entrypoint.sh | 2 ++ Dockerfiles/server-mysql/rhel/README.html | 1 + Dockerfiles/server-mysql/rhel/docker-entrypoint.sh | 2 ++ Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh | 2 ++ Dockerfiles/server-pgsql/README.md | 1 + Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh | 2 ++ Dockerfiles/server-pgsql/centos/docker-entrypoint.sh | 2 ++ Dockerfiles/server-pgsql/ol/docker-entrypoint.sh | 2 ++ Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh | 2 ++ env_vars/.env_srv | 1 + 13 files changed, 22 insertions(+) diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md index bdd7dcb1c..f1d044d0a 100644 --- a/Dockerfiles/server-mysql/README.md +++ b/Dockerfiles/server-mysql/README.md @@ -174,6 +174,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 cd5f0488c..b2f8f5169 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -488,6 +488,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh index 050f41e5e..0c7d1c6de 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -485,6 +485,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh index 050f41e5e..0c7d1c6de 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -485,6 +485,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-mysql/rhel/README.html b/Dockerfiles/server-mysql/rhel/README.html index 3b18ffe82..57267bd8f 100644 --- a/Dockerfiles/server-mysql/rhel/README.html +++ b/Dockerfiles/server-mysql/rhel/README.html @@ -119,6 +119,7 @@ podman run --name some-zabbix-server-mysql -e DB_SER 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 050f41e5e..0c7d1c6de 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -485,6 +485,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh index dfb6bb7be..f0c0f1254 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -485,6 +485,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-pgsql/README.md b/Dockerfiles/server-pgsql/README.md index c4bc97e6d..d67dec012 100644 --- a/Dockerfiles/server-pgsql/README.md +++ b/Dockerfiles/server-pgsql/README.md @@ -175,6 +175,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-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index fd5cb9fdb..aa4c1647a 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -505,6 +505,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index fd5cb9fdb..aa4c1647a 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -505,6 +505,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index fd5cb9fdb..aa4c1647a 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -505,6 +505,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index 1fb5674d2..1fe0cc67f 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -505,6 +505,8 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}" update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}" + update_config_var $ZBX_CONFIG "SMSDevices" "${ZBX_SMSDEVICES}" + if [ "$(id -u)" != '0' ]; then update_config_var $ZBX_CONFIG "User" "$(whoami)" else diff --git a/env_vars/.env_srv b/env_vars/.env_srv index 5be2092c3..eaf288ff9 100644 --- a/env_vars/.env_srv +++ b/env_vars/.env_srv @@ -32,6 +32,7 @@ ZBX_STARTJAVAPOLLERS=5 # ZBX_VMWARETIMEOUT=10 ZBX_ENABLE_SNMP_TRAPS=true # ZBX_SOURCEIP= +# ZBX_SMSDEVICES= # ZBX_HOUSEKEEPINGFREQUENCY=1 # ZBX_MAXHOUSEKEEPERDELETE=5000 # ZBX_CACHESIZE=8M