From 9bd19e08da59af27a3b417077534d7365dd9bbc1 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 16 Aug 2023 16:55:59 +0900
Subject: [PATCH] Fixed missing and incorrect variables

---
 Dockerfiles/agent2/alpine/docker-entrypoint.sh       | 5 +++++
 Dockerfiles/agent2/centos/docker-entrypoint.sh       | 5 +++++
 Dockerfiles/agent2/ol/docker-entrypoint.sh           | 5 +++++
 Dockerfiles/agent2/rhel/docker-entrypoint.sh         | 5 +++++
 Dockerfiles/agent2/ubuntu/docker-entrypoint.sh       | 5 +++++
 Dockerfiles/agent2/windows/docker-entrypoint.ps1     | 5 +++++
 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/docker-entrypoint.sh   | 2 +-
 Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh | 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/ubuntu/docker-entrypoint.sh | 2 +-
 env_vars/.env_agent                                  | 5 +++++
 env_vars/.env_prx                                    | 1 +
 env_vars/.env_srv                                    | 1 +
 18 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/Dockerfiles/agent2/alpine/docker-entrypoint.sh b/Dockerfiles/agent2/alpine/docker-entrypoint.sh
index f1f99fcca..9529c3638 100755
--- a/Dockerfiles/agent2/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/alpine/docker-entrypoint.sh
@@ -152,6 +152,11 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+<<<<<<< HEAD
+=======
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
+    update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
+>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
 
     if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
         update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"
diff --git a/Dockerfiles/agent2/centos/docker-entrypoint.sh b/Dockerfiles/agent2/centos/docker-entrypoint.sh
index f1f99fcca..9529c3638 100755
--- a/Dockerfiles/agent2/centos/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/centos/docker-entrypoint.sh
@@ -152,6 +152,11 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+<<<<<<< HEAD
+=======
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
+    update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
+>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
 
     if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
         update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"
diff --git a/Dockerfiles/agent2/ol/docker-entrypoint.sh b/Dockerfiles/agent2/ol/docker-entrypoint.sh
index f1f99fcca..9529c3638 100755
--- a/Dockerfiles/agent2/ol/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/ol/docker-entrypoint.sh
@@ -152,6 +152,11 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+<<<<<<< HEAD
+=======
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
+    update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
+>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
 
     if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
         update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"
diff --git a/Dockerfiles/agent2/rhel/docker-entrypoint.sh b/Dockerfiles/agent2/rhel/docker-entrypoint.sh
index f1f99fcca..9529c3638 100755
--- a/Dockerfiles/agent2/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/rhel/docker-entrypoint.sh
@@ -152,6 +152,11 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+<<<<<<< HEAD
+=======
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
+    update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
+>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
 
     if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
         update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"
diff --git a/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh b/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh
index f1f99fcca..9529c3638 100755
--- a/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/agent2/ubuntu/docker-entrypoint.sh
@@ -152,6 +152,11 @@ prepare_zbx_agent_config() {
     else
         update_config_var $ZBX_AGENT_CONFIG "ServerActive"
     fi
+<<<<<<< HEAD
+=======
+    update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
+    update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
+>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
 
     if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
         update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"
diff --git a/Dockerfiles/agent2/windows/docker-entrypoint.ps1 b/Dockerfiles/agent2/windows/docker-entrypoint.ps1
index 61a6f7a90..36cb401d9 100644
--- a/Dockerfiles/agent2/windows/docker-entrypoint.ps1
+++ b/Dockerfiles/agent2/windows/docker-entrypoint.ps1
@@ -163,6 +163,11 @@ function Prepare-Zbx-Agent-Config {
     else {
         Update-Config-Var $ZbxAgentConfig "ServerActive"
     }
+<<<<<<< HEAD
+=======
+    Update-Config-Var $ZbxAgentConfig "HeartbeatFrequency" "$env:ZBX_HEARTBEAT_FREQUENCY"
+    Update-Config-Var $ZbxAgentConfig "ForceActiveChecksOnStart" "$env:ZBX_FORCEACTIVECHECKSONSTART"
+>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
 
     if ([string]::IsNullOrWhitespace($env:ZBX_ENABLEPERSISTENTBUFFER)) {
         $env:ZBX_ENABLEPERSISTENTBUFFER="true"
diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
index 54cc209d5..d57d25d92 100755
--- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
@@ -449,7 +449,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 "ProblemHousekeepingFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
 
     update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
 
diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
index 42cd65839..82205da3f 100755
--- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
@@ -446,7 +446,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 "ProblemHousekeepingFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
 
     update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
 
diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
index 42cd65839..82205da3f 100755
--- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
@@ -446,7 +446,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 "ProblemHousekeepingFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
 
     update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
 
diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
index 42cd65839..82205da3f 100755
--- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
@@ -446,7 +446,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 "ProblemHousekeepingFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
 
     update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
 
diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
index d1f93865c..992e8b0a9 100755
--- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
@@ -446,7 +446,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 "ProblemHousekeepingFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
 
     update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
 
diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
index 08c4aac39..3e2bb7c0d 100755
--- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
@@ -466,7 +466,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 "ProblemHousekeepingFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
 
     update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
 
diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
index 08c4aac39..3e2bb7c0d 100755
--- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
@@ -466,7 +466,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 "ProblemHousekeepingFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
 
     update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
 
diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
index 08c4aac39..3e2bb7c0d 100755
--- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
@@ -466,7 +466,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 "ProblemHousekeepingFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
 
     update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
 
diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
index 95273cf75..73f8ae46f 100755
--- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
+++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
@@ -466,7 +466,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 "ProblemHousekeepingFrequency" "${ZBX_PROBLEMHOUSEKEEPINGFREQUENCY}"
 
     update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
 
diff --git a/env_vars/.env_agent b/env_vars/.env_agent
index 58ecf335e..26392113f 100644
--- a/env_vars/.env_agent
+++ b/env_vars/.env_agent
@@ -2,6 +2,11 @@
 # ZBX_DEBUGLEVEL=3
 # ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
 # ZBX_LOGREMOTECOMMANDS=0
+<<<<<<< HEAD
+=======
+# ZBX_FORCEACTIVECHECKSONSTART=0 # Available since 6.0.2
+# ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2
+>>>>>>> d4f6f4946 (Fixed missing and incorrect variables)
 # ZBX_HOSTINTERFACE= # Available since 4.4.0
 # ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
 # ZBX_SERVER_HOST=zabbix-server
diff --git a/env_vars/.env_prx b/env_vars/.env_prx
index 5447cf2d4..ecbfbba92 100644
--- a/env_vars/.env_prx
+++ b/env_vars/.env_prx
@@ -26,6 +26,7 @@
 # ZBX_STARTTRAPPERS=5
 # ZBX_STARTPINGERS=1
 # ZBX_STARTDISCOVERERS=1
+# ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0
 # ZBX_STARTHTTPPOLLERS=1
 # ZBX_JAVAGATEWAY_ENABLE=false
 # ZBX_JAVAGATEWAY=zabbix-java-gateway
diff --git a/env_vars/.env_srv b/env_vars/.env_srv
index cc96709c5..68a1f0884 100644
--- a/env_vars/.env_srv
+++ b/env_vars/.env_srv
@@ -22,6 +22,7 @@
 # ZBX_STARTTRAPPERS=5
 # ZBX_STARTPINGERS=1
 # ZBX_STARTDISCOVERERS=1
+# ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0
 # ZBX_STARTHTTPPOLLERS=1
 # ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0
 # ZBX_STARTTIMERS=1