extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-20 09:57:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed missing and incorrect variables

Browse Source
This commit is contained in:
Alexey Pustovalov 2023-08-16 16:55:59 +09:00
parent 07c255bfd6
commit 9bd19e08da
18 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfiles/agent2/alpine/docker-entrypoint.sh
View File

@ -152,6 +152,11 @@ prepare_zbx_agent_config() {
else else
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi 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 if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"

5
Dockerfiles/agent2/centos/docker-entrypoint.sh
View File

@ -152,6 +152,11 @@ prepare_zbx_agent_config() {
else else
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi 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 if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"

5
Dockerfiles/agent2/ol/docker-entrypoint.sh
View File

@ -152,6 +152,11 @@ prepare_zbx_agent_config() {
else else
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi 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 if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"

5
Dockerfiles/agent2/rhel/docker-entrypoint.sh
View File

@ -152,6 +152,11 @@ prepare_zbx_agent_config() {
else else
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi 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 if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"

5
Dockerfiles/agent2/ubuntu/docker-entrypoint.sh
View File

@ -152,6 +152,11 @@ prepare_zbx_agent_config() {
else else
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi 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 if [ "${ZBX_ENABLEPERSISTENTBUFFER,,}" == "true" ]; then
update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1" update_config_var $ZBX_AGENT_CONFIG "EnablePersistentBuffer" "1"

5
Dockerfiles/agent2/windows/docker-entrypoint.ps1
View File

@ -163,6 +163,11 @@ function Prepare-Zbx-Agent-Config {
else { else {
Update-Config-Var $ZbxAgentConfig "ServerActive" 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)) { if ([string]::IsNullOrWhitespace($env:ZBX_ENABLEPERSISTENTBUFFER)) {
$env:ZBX_ENABLEPERSISTENTBUFFER="true" $env:ZBX_ENABLEPERSISTENTBUFFER="true"

2
Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
View File

@ -449,7 +449,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" 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}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

2
Dockerfiles/server-mysql/centos/docker-entrypoint.sh
View File

@ -446,7 +446,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" 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}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

2
Dockerfiles/server-mysql/ol/docker-entrypoint.sh
View File

@ -446,7 +446,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" 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}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

2
Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
View File

@ -446,7 +446,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" 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}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

2
Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -446,7 +446,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" 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}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

2
Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
View File

@ -466,7 +466,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" 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}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

2
Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
View File

@ -466,7 +466,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" 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}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

2
Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
View File

@ -466,7 +466,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" 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}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

2
Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -466,7 +466,7 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}" update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}" 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}" update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"

5
env_vars/.env_agent
View File

@ -2,6 +2,11 @@
# ZBX_DEBUGLEVEL=3 # ZBX_DEBUGLEVEL=3
# ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0 # ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
# ZBX_LOGREMOTECOMMANDS=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_HOSTINTERFACE= # Available since 4.4.0
# ZBX_HOSTINTERFACEITEM= # Available since 4.4.0 # ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
# ZBX_SERVER_HOST=zabbix-server # ZBX_SERVER_HOST=zabbix-server

1
env_vars/.env_prx
View File

@ -26,6 +26,7 @@
# ZBX_STARTTRAPPERS=5 # ZBX_STARTTRAPPERS=5
# ZBX_STARTPINGERS=1 # ZBX_STARTPINGERS=1
# ZBX_STARTDISCOVERERS=1 # ZBX_STARTDISCOVERERS=1
# ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0
# ZBX_STARTHTTPPOLLERS=1 # ZBX_STARTHTTPPOLLERS=1
# ZBX_JAVAGATEWAY_ENABLE=false # ZBX_JAVAGATEWAY_ENABLE=false
# ZBX_JAVAGATEWAY=zabbix-java-gateway # ZBX_JAVAGATEWAY=zabbix-java-gateway

1
env_vars/.env_srv
View File

@ -22,6 +22,7 @@
# ZBX_STARTTRAPPERS=5 # ZBX_STARTTRAPPERS=5
# ZBX_STARTPINGERS=1 # ZBX_STARTPINGERS=1
# ZBX_STARTDISCOVERERS=1 # ZBX_STARTDISCOVERERS=1
# ZBX_STARTODBCPOLLERS=1 # Available since 6.0.0
# ZBX_STARTHTTPPOLLERS=1 # ZBX_STARTHTTPPOLLERS=1
# ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0 # ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0
# ZBX_STARTTIMERS=1 # ZBX_STARTTIMERS=1