From 8d654cc4c991bca0e02a050bafbe9a94bcddabc4 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
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                   | 2 +-
 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/rhel/README.html            | 1 +
 Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh   | 2 ++
 Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh | 2 ++
 env_vars/.env_srv                                    | 1 +
 15 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md
index 027b651c1..10168e229 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 a15d8a88a..83154dcb5 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 3860639ef..f44468466 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 3860639ef..f44468466 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 fee69ce84..5e013c711 100644
--- a/Dockerfiles/server-mysql/rhel/README.html
+++ b/Dockerfiles/server-mysql/rhel/README.html
@@ -121,6 +121,7 @@ <h3 id="other-variables">Other variables</h3>
 <span class="hljs-attr">ZBX_VMWARETIMEOUT</span>=<span class="hljs-number">10</span>
 <span class="hljs-attr">ZBX_ENABLE_SNMP_TRAPS</span>=<span class="hljs-literal">false</span>
 <span class="hljs-attr">ZBX_SOURCEIP</span>=
+<span class="hljs-attr">ZBX_SMSDEVICES</span>=
 <span class="hljs-attr">ZBX_HOUSEKEEPINGFREQUENCY</span>=<span class="hljs-number">1</span>
 <span class="hljs-attr">ZBX_MAXHOUSEKEEPERDELETE</span>=<span class="hljs-number">5000</span>
 <span class="hljs-attr">ZBX_PROBLEMHOUSEKEEPINGFREQUENCY</span>=<span class="hljs-number">60</span> # Available since <span class="hljs-number">6.0</span>.<span class="hljs-number">0</span>
diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
index 3860639ef..f44468466 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 beabcf071..4675a05bf 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 0642d3465..4a5e13118 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 511031ba2..5d3e1d613 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 511031ba2..5d3e1d613 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 511031ba2..5d3e1d613 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 4d47b8785..02c331245 100644
--- a/Dockerfiles/server-pgsql/rhel/README.html
+++ b/Dockerfiles/server-pgsql/rhel/README.html
@@ -120,6 +120,7 @@ <h3 id="other-variables">Other variables</h3>
 <span class="hljs-attr">ZBX_VMWARECACHESIZE</span>=<span class="hljs-number">8</span>M
 <span class="hljs-attr">ZBX_VMWARETIMEOUT</span>=<span class="hljs-number">10</span>
 <span class="hljs-attr">ZBX_ENABLE_SNMP_TRAPS</span>=<span class="hljs-literal">false</span>
+<span class="hljs-attr">ZBX_SMSDEVICES</span>=
 <span class="hljs-attr">ZBX_SOURCEIP</span>=
 <span class="hljs-attr">ZBX_HOUSEKEEPINGFREQUENCY</span>=<span class="hljs-number">1</span>
 <span class="hljs-attr">ZBX_MAXHOUSEKEEPERDELETE</span>=<span class="hljs-number">5000</span>
diff --git a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh
index 511031ba2..5d3e1d613 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 e41e00380..fff2ba0b3 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 263e0f308..ba6a281fd 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