diff options
| author | Andrejs Kozlovs <andrejs.kozlovs@zabbix.com> | 2022-03-26 12:21:47 +0300 |
|---|---|---|
| committer | Andrejs Kozlovs <andrejs.kozlovs@zabbix.com> | 2022-03-26 12:21:47 +0300 |
| commit | ab20e84e8752634b60fe1523d10a31d74460d37d (patch) | |
| tree | 2f46e569e3c7536d9904c274ad0bab670c030ea9 /conf | |
| parent | 7bc974513aeaec58a0c4319a48b7510516464d9b (diff) | |
| parent | 90f5c4ba3c22a0e554c97cb10446f9f5064c7333 (diff) | |
....I..... [ZBXNEXT-7498] fixed configuration files
Merge in ZBX/zabbix from feature/ZBXNEXT-7498-6.1 to master
* commit '90f5c4ba3c22a0e554c97cb10446f9f5064c7333':
....I..... [ZBXNEXT-7498] fixed configuration files
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/zabbix_proxy.conf | 10 | ||||
| -rw-r--r-- | conf/zabbix_server.conf | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf index 0d254e5fdd2..b05352c17fe 100644 --- a/conf/zabbix_proxy.conf +++ b/conf/zabbix_proxy.conf @@ -299,16 +299,6 @@ DBUser=zabbix # Default: # StartPollersUnreachable=1 -### Option: StartHistoryPollers -# Number of pre-forked instances of history pollers. -# Only required for internal checks. -# A database connection is required for each history poller instance. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartHistoryPollers=1 - ### Option: StartTrappers # Number of pre-forked instances of trappers. # Trappers accept incoming connections from Zabbix sender and active agents. diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf index fde5b646707..30a5a526586 100644 --- a/conf/zabbix_server.conf +++ b/conf/zabbix_server.conf @@ -237,7 +237,7 @@ DBUser=zabbix ### Option: StartHistoryPollers # Number of pre-forked instances of history pollers. -# Only required for calculated and internal checks. +# Only required for calculated checks. # A database connection is required for each history poller instance. # # Mandatory: no |