mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-19 04:45:59 +02:00
Merge branch 'trunk' into 5.0
This commit is contained in:
@@ -304,6 +304,7 @@ update_zbx_config() {
|
||||
|
||||
update_config_var $ZBX_CONFIG "ListenIP" "${ZBX_LISTENIP}"
|
||||
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
|
||||
update_config_var $ZBX_CONFIG "ListenBacklog" "${ZBX_LISTENBACKLOG}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
|
||||
update_config_var $ZBX_CONFIG "LogType" "console"
|
||||
@@ -393,6 +394,7 @@ update_zbx_config() {
|
||||
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "TrendCacheSize" "${ZBX_TRENDCACHESIZE}"
|
||||
update_config_var $ZBX_CONFIG "TrendFunctionCacheSize" "${ZBX_TRENDFUNCTIONCACHESIZE}"
|
||||
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
|
||||
|
@@ -301,6 +301,7 @@ update_zbx_config() {
|
||||
|
||||
update_config_var $ZBX_CONFIG "ListenIP" "${ZBX_LISTENIP}"
|
||||
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
|
||||
update_config_var $ZBX_CONFIG "ListenBacklog" "${ZBX_LISTENBACKLOG}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
|
||||
update_config_var $ZBX_CONFIG "LogType" "console"
|
||||
@@ -390,6 +391,7 @@ update_zbx_config() {
|
||||
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "TrendCacheSize" "${ZBX_TRENDCACHESIZE}"
|
||||
update_config_var $ZBX_CONFIG "TrendFunctionCacheSize" "${ZBX_TRENDFUNCTIONCACHESIZE}"
|
||||
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
|
||||
|
@@ -301,6 +301,7 @@ update_zbx_config() {
|
||||
|
||||
update_config_var $ZBX_CONFIG "ListenIP" "${ZBX_LISTENIP}"
|
||||
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
|
||||
update_config_var $ZBX_CONFIG "ListenBacklog" "${ZBX_LISTENBACKLOG}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
|
||||
update_config_var $ZBX_CONFIG "LogType" "console"
|
||||
@@ -390,6 +391,7 @@ update_zbx_config() {
|
||||
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "TrendCacheSize" "${ZBX_TRENDCACHESIZE}"
|
||||
update_config_var $ZBX_CONFIG "TrendFunctionCacheSize" "${ZBX_TRENDFUNCTIONCACHESIZE}"
|
||||
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
|
||||
|
@@ -301,6 +301,7 @@ update_zbx_config() {
|
||||
|
||||
update_config_var $ZBX_CONFIG "ListenIP" "${ZBX_LISTENIP}"
|
||||
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
|
||||
update_config_var $ZBX_CONFIG "ListenBacklog" "${ZBX_LISTENBACKLOG}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
|
||||
update_config_var $ZBX_CONFIG "LogType" "console"
|
||||
@@ -390,6 +391,7 @@ update_zbx_config() {
|
||||
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "TrendCacheSize" "${ZBX_TRENDCACHESIZE}"
|
||||
update_config_var $ZBX_CONFIG "TrendFunctionCacheSize" "${ZBX_TRENDFUNCTIONCACHESIZE}"
|
||||
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
|
||||
|
@@ -301,6 +301,7 @@ update_zbx_config() {
|
||||
|
||||
update_config_var $ZBX_CONFIG "ListenIP" "${ZBX_LISTENIP}"
|
||||
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
|
||||
update_config_var $ZBX_CONFIG "ListenBacklog" "${ZBX_LISTENBACKLOG}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
|
||||
update_config_var $ZBX_CONFIG "LogType" "console"
|
||||
@@ -390,6 +391,7 @@ update_zbx_config() {
|
||||
update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "TrendCacheSize" "${ZBX_TRENDCACHESIZE}"
|
||||
update_config_var $ZBX_CONFIG "TrendFunctionCacheSize" "${ZBX_TRENDFUNCTIONCACHESIZE}"
|
||||
update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
|
||||
|
||||
update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
|
||||
|
Reference in New Issue
Block a user