extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-29 03:03:10 +01: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 18047ca74d
commit d4f6f49465
18 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,7 @@ prepare_zbx_agent_config() {
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi fi
update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}" update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
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"

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

@ -153,6 +153,7 @@ prepare_zbx_agent_config() {
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi fi
update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}" update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
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"

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

@ -153,6 +153,7 @@ prepare_zbx_agent_config() {
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi fi
update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}" update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
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"

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

@ -153,6 +153,7 @@ prepare_zbx_agent_config() {
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi fi
update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}" update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
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"

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

@ -153,6 +153,7 @@ prepare_zbx_agent_config() {
update_config_var $ZBX_AGENT_CONFIG "ServerActive" update_config_var $ZBX_AGENT_CONFIG "ServerActive"
fi fi
update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}" update_config_var $ZBX_AGENT_CONFIG "HeartbeatFrequency" "${ZBX_HEARTBEAT_FREQUENCY}"
update_config_var $ZBX_AGENT_CONFIG "ForceActiveChecksOnStart" "${ZBX_FORCEACTIVECHECKSONSTART}"
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"

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

@ -164,6 +164,7 @@ function Prepare-Zbx-Agent-Config {
Update-Config-Var $ZbxAgentConfig "ServerActive" Update-Config-Var $ZbxAgentConfig "ServerActive"
} }
Update-Config-Var $ZbxAgentConfig "HeartbeatFrequency" "$env:ZBX_HEARTBEAT_FREQUENCY" Update-Config-Var $ZbxAgentConfig "HeartbeatFrequency" "$env:ZBX_HEARTBEAT_FREQUENCY"
Update-Config-Var $ZbxAgentConfig "ForceActiveChecksOnStart" "$env:ZBX_FORCEACTIVECHECKSONSTART"
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

@ -462,7 +462,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

@ -459,7 +459,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

@ -459,7 +459,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

@ -459,7 +459,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

@ -459,7 +459,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

@ -479,7 +479,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

@ -479,7 +479,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

@ -479,7 +479,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

@ -479,7 +479,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}"

1
env_vars/.env_agent
View File

@ -2,6 +2,7 @@
# 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
# ZBX_FORCEACTIVECHECKSONSTART=0 # Available since 6.0.2
# ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2 # ZBX_HEARTBEAT_FREQUENCY=60 # Available since 6.2
# 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

1
env_vars/.env_prx
View File

@ -32,6 +32,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_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0 # ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0
# ZBX_STARTHTTPPOLLERS=1 # ZBX_STARTHTTPPOLLERS=1
# ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0 # ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0

1
env_vars/.env_srv
View File

@ -25,6 +25,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_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0 # ZBX_STARTHTTPAGENTPOLLERS=1 # Available since 7.0.0
# ZBX_STARTHTTPPOLLERS=1 # ZBX_STARTHTTPPOLLERS=1
# ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0 # ZBX_STARTSNMPPOLLERS=1 # Available since 7.0.0