From 7bf89628db2b2ff9e451762802d6d87785902469 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 4 Aug 2021 13:37:59 +0200 Subject: [PATCH] Fixed ZBX_TRAPPERTIMEOUT variable name --- .env_prx | 2 +- .env_srv | 2 +- .github/workflows/CI.yml | 2 +- proxy-mysql/alpine/README.md | 2 +- proxy-mysql/alpine/docker-entrypoint.sh | 2 +- proxy-mysql/centos/README.md | 2 +- proxy-mysql/centos/docker-entrypoint.sh | 2 +- proxy-mysql/ubuntu/README.md | 2 +- proxy-mysql/ubuntu/docker-entrypoint.sh | 2 +- proxy-sqlite3/alpine/README.md | 2 +- proxy-sqlite3/alpine/docker-entrypoint.sh | 2 +- proxy-sqlite3/centos/README.md | 2 +- proxy-sqlite3/centos/docker-entrypoint.sh | 2 +- proxy-sqlite3/ubuntu/README.md | 2 +- proxy-sqlite3/ubuntu/docker-entrypoint.sh | 2 +- server-mysql/alpine/README.md | 2 +- server-mysql/alpine/docker-entrypoint.sh | 2 +- server-mysql/centos/README.md | 2 +- server-mysql/centos/docker-entrypoint.sh | 2 +- server-mysql/ubuntu/README.md | 2 +- server-mysql/ubuntu/docker-entrypoint.sh | 2 +- server-pgsql/alpine/README.md | 2 +- server-pgsql/alpine/docker-entrypoint.sh | 2 +- server-pgsql/centos/README.md | 2 +- server-pgsql/centos/docker-entrypoint.sh | 2 +- server-pgsql/ubuntu/README.md | 2 +- server-pgsql/ubuntu/docker-entrypoint.sh | 2 +- zabbix-appliance/alpine/README.md | 2 +- zabbix-appliance/alpine/docker-entrypoint.sh | 2 +- zabbix-appliance/centos/README.md | 2 +- zabbix-appliance/centos/docker-entrypoint.sh | 2 +- zabbix-appliance/rhel/README.md | 2 +- zabbix-appliance/rhel/docker-entrypoint.sh | 2 +- zabbix-appliance/ubuntu/README.md | 2 +- zabbix-appliance/ubuntu/docker-entrypoint.sh | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.env_prx b/.env_prx index 9b68b7d0a..99d3972bf 100644 --- a/.env_prx +++ b/.env_prx @@ -34,7 +34,7 @@ # ZBX_HISTORYCACHESIZE=16M # ZBX_HISTORYINDEXCACHESIZE=4M # ZBX_TIMEOUT=4 -# ZBX_TRAPPERIMEOUT=300 +# ZBX_TRAPPERTIMEOUT=300 # ZBX_UNREACHABLEPERIOD=45 # ZBX_UNAVAILABLEDELAY=60 # ZBX_UNREACHABLEDELAY=15 diff --git a/.env_srv b/.env_srv index 26de82dd0..caf398c36 100644 --- a/.env_srv +++ b/.env_srv @@ -31,7 +31,7 @@ ZBX_ENABLE_SNMP_TRAPS=true # ZBX_TRENDCACHESIZE=4M # ZBX_VALUECACHESIZE=8M # ZBX_TIMEOUT=4 -# ZBX_TRAPPERIMEOUT=300 +# ZBX_TRAPPERTIMEOUT=300 # ZBX_UNREACHABLEPERIOD=45 # ZBX_UNAVAILABLEDELAY=60 # ZBX_UNREACHABLEDELAY=15 diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 74a373b3b..54fce93a8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -70,7 +70,7 @@ jobs: - name: Prepare platform list id: platform run: | - DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le" + DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x" if [ "${{ matrix.build }}" == "agent2" ]; then DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" diff --git a/proxy-mysql/alpine/README.md b/proxy-mysql/alpine/README.md index 8f7bfb558..d3051b713 100644 --- a/proxy-mysql/alpine/README.md +++ b/proxy-mysql/alpine/README.md @@ -206,7 +206,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh index 3d2794c41..0343e7500 100755 --- a/proxy-mysql/alpine/docker-entrypoint.sh +++ b/proxy-mysql/alpine/docker-entrypoint.sh @@ -355,7 +355,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/proxy-mysql/centos/README.md b/proxy-mysql/centos/README.md index 8f7bfb558..d3051b713 100644 --- a/proxy-mysql/centos/README.md +++ b/proxy-mysql/centos/README.md @@ -206,7 +206,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh index 9f2450b43..09b554963 100755 --- a/proxy-mysql/centos/docker-entrypoint.sh +++ b/proxy-mysql/centos/docker-entrypoint.sh @@ -355,7 +355,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/proxy-mysql/ubuntu/README.md b/proxy-mysql/ubuntu/README.md index 8f7bfb558..d3051b713 100644 --- a/proxy-mysql/ubuntu/README.md +++ b/proxy-mysql/ubuntu/README.md @@ -206,7 +206,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh index 9b949a8e3..68216a36c 100755 --- a/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -355,7 +355,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/proxy-sqlite3/alpine/README.md b/proxy-sqlite3/alpine/README.md index bcd4c5b1a..79b7319e4 100644 --- a/proxy-sqlite3/alpine/README.md +++ b/proxy-sqlite3/alpine/README.md @@ -164,7 +164,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh index 39d39e097..d8be8580e 100755 --- a/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -192,7 +192,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/proxy-sqlite3/centos/README.md b/proxy-sqlite3/centos/README.md index bcd4c5b1a..79b7319e4 100644 --- a/proxy-sqlite3/centos/README.md +++ b/proxy-sqlite3/centos/README.md @@ -164,7 +164,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh index 39d39e097..d8be8580e 100755 --- a/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/proxy-sqlite3/centos/docker-entrypoint.sh @@ -192,7 +192,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/proxy-sqlite3/ubuntu/README.md b/proxy-sqlite3/ubuntu/README.md index bcd4c5b1a..79b7319e4 100644 --- a/proxy-sqlite3/ubuntu/README.md +++ b/proxy-sqlite3/ubuntu/README.md @@ -164,7 +164,7 @@ ZBX_CACHESIZE=8M ZBX_STARTDBSYNCERS=4 ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh index ae3bf72f4..ab319d3e9 100755 --- a/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -192,7 +192,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-mysql/alpine/README.md b/server-mysql/alpine/README.md index 100ea342f..6683fbbd9 100644 --- a/server-mysql/alpine/README.md +++ b/server-mysql/alpine/README.md @@ -184,7 +184,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh index 6db086bca..0f33fe261 100755 --- a/server-mysql/alpine/docker-entrypoint.sh +++ b/server-mysql/alpine/docker-entrypoint.sh @@ -343,7 +343,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-mysql/centos/README.md b/server-mysql/centos/README.md index 100ea342f..6683fbbd9 100644 --- a/server-mysql/centos/README.md +++ b/server-mysql/centos/README.md @@ -184,7 +184,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh index 6db086bca..0f33fe261 100755 --- a/server-mysql/centos/docker-entrypoint.sh +++ b/server-mysql/centos/docker-entrypoint.sh @@ -343,7 +343,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-mysql/ubuntu/README.md b/server-mysql/ubuntu/README.md index 100ea342f..6683fbbd9 100644 --- a/server-mysql/ubuntu/README.md +++ b/server-mysql/ubuntu/README.md @@ -184,7 +184,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh index 34d455680..1cdead183 100755 --- a/server-mysql/ubuntu/docker-entrypoint.sh +++ b/server-mysql/ubuntu/docker-entrypoint.sh @@ -343,7 +343,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-pgsql/alpine/README.md b/server-pgsql/alpine/README.md index 7a42c8df8..9d172948d 100644 --- a/server-pgsql/alpine/README.md +++ b/server-pgsql/alpine/README.md @@ -181,7 +181,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh index b15aa17e7..c76b004f4 100755 --- a/server-pgsql/alpine/docker-entrypoint.sh +++ b/server-pgsql/alpine/docker-entrypoint.sh @@ -352,7 +352,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-pgsql/centos/README.md b/server-pgsql/centos/README.md index 7a42c8df8..9d172948d 100644 --- a/server-pgsql/centos/README.md +++ b/server-pgsql/centos/README.md @@ -181,7 +181,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh index b15aa17e7..c76b004f4 100755 --- a/server-pgsql/centos/docker-entrypoint.sh +++ b/server-pgsql/centos/docker-entrypoint.sh @@ -352,7 +352,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/server-pgsql/ubuntu/README.md b/server-pgsql/ubuntu/README.md index 7a42c8df8..9d172948d 100644 --- a/server-pgsql/ubuntu/README.md +++ b/server-pgsql/ubuntu/README.md @@ -181,7 +181,7 @@ ZBX_HISTORYINDEXCACHESIZE=4M ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0 ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh index 37214bebf..33b907288 100755 --- a/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/server-pgsql/ubuntu/docker-entrypoint.sh @@ -352,7 +352,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}" update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/zabbix-appliance/alpine/README.md b/zabbix-appliance/alpine/README.md index 65ec46837..cf50062bb 100644 --- a/zabbix-appliance/alpine/README.md +++ b/zabbix-appliance/alpine/README.md @@ -143,7 +143,7 @@ ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/zabbix-appliance/alpine/docker-entrypoint.sh b/zabbix-appliance/alpine/docker-entrypoint.sh index 2665cfd0d..faf1e33ac 100755 --- a/zabbix-appliance/alpine/docker-entrypoint.sh +++ b/zabbix-appliance/alpine/docker-entrypoint.sh @@ -807,7 +807,7 @@ update_zbx_config() { fi update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/zabbix-appliance/centos/README.md b/zabbix-appliance/centos/README.md index 65ec46837..cf50062bb 100644 --- a/zabbix-appliance/centos/README.md +++ b/zabbix-appliance/centos/README.md @@ -143,7 +143,7 @@ ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/zabbix-appliance/centos/docker-entrypoint.sh b/zabbix-appliance/centos/docker-entrypoint.sh index 2665cfd0d..faf1e33ac 100755 --- a/zabbix-appliance/centos/docker-entrypoint.sh +++ b/zabbix-appliance/centos/docker-entrypoint.sh @@ -807,7 +807,7 @@ update_zbx_config() { fi update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/zabbix-appliance/rhel/README.md b/zabbix-appliance/rhel/README.md index ae3c8be38..afd4138e2 100644 --- a/zabbix-appliance/rhel/README.md +++ b/zabbix-appliance/rhel/README.md @@ -141,7 +141,7 @@ ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/zabbix-appliance/rhel/docker-entrypoint.sh b/zabbix-appliance/rhel/docker-entrypoint.sh index 23c832139..474a58a96 100755 --- a/zabbix-appliance/rhel/docker-entrypoint.sh +++ b/zabbix-appliance/rhel/docker-entrypoint.sh @@ -807,7 +807,7 @@ update_zbx_config() { fi update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}" diff --git a/zabbix-appliance/ubuntu/README.md b/zabbix-appliance/ubuntu/README.md index 65ec46837..cf50062bb 100644 --- a/zabbix-appliance/ubuntu/README.md +++ b/zabbix-appliance/ubuntu/README.md @@ -143,7 +143,7 @@ ZBX_HISTORYCACHESIZE=16M ZBX_HISTORYINDEXCACHESIZE=4M ZBX_TRENDCACHESIZE=4M ZBX_VALUECACHESIZE=8M -ZBX_TRAPPERIMEOUT=300 +ZBX_TRAPPERTIMEOUT=300 ZBX_UNREACHABLEPERIOD=45 ZBX_UNAVAILABLEDELAY=60 ZBX_UNREACHABLEDELAY=15 diff --git a/zabbix-appliance/ubuntu/docker-entrypoint.sh b/zabbix-appliance/ubuntu/docker-entrypoint.sh index 2665cfd0d..faf1e33ac 100755 --- a/zabbix-appliance/ubuntu/docker-entrypoint.sh +++ b/zabbix-appliance/ubuntu/docker-entrypoint.sh @@ -807,7 +807,7 @@ update_zbx_config() { fi update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}" - update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}" + update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}" update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}" update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}" update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"