diff options
| -rw-r--r-- | conf/zabbix_proxy.conf | 10 | ||||
| -rw-r--r-- | conf/zabbix_server.conf | 10 | ||||
| -rw-r--r-- | man/zabbix_proxy.man | 2 | ||||
| -rw-r--r-- | man/zabbix_server.man | 2 | ||||
| -rw-r--r-- | src/libs/zbxdbcache/dbcache.c | 1 | ||||
| -rw-r--r-- | src/libs/zbxdbhigh/proxy.c | 1 | ||||
| -rw-r--r-- | src/zabbix_proxy/proxy.c | 2 |
7 files changed, 23 insertions, 5 deletions
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf index b5e4622dd85..a1deb62bd9b 100644 --- a/conf/zabbix_proxy.conf +++ b/conf/zabbix_proxy.conf @@ -290,6 +290,16 @@ 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 88b1e53d3c6..29d10e7c225 100644 --- a/conf/zabbix_server.conf +++ b/conf/zabbix_server.conf @@ -210,6 +210,16 @@ DBUser=zabbix # Default: # StartPollersUnreachable=1 +### Option: StartHistoryPollers +# Number of pre-forked instances of history pollers. +# Only required for calculated, aggregated and internal checks. +# A database connection is required for each history poller instance. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartHistoryPollers=5 + ### Option: StartTrappers # Number of pre-forked instances of trappers. # Trappers accept incoming connections from Zabbix sender, active agents and active proxies. diff --git a/man/zabbix_proxy.man b/man/zabbix_proxy.man index 0bf74dbe374..5b3667ac024 100644 --- a/man/zabbix_proxy.man +++ b/man/zabbix_proxy.man @@ -105,7 +105,7 @@ Log level control targets .RS 4 .TP 4 .I process\-type -All processes of specified type (configuration\ syncer, data\ sender, discoverer, heartbeat\ sender, history\ syncer, housekeeper, http\ poller, icmp\ pinger, ipmi\ manager, ipmi\ poller, java\ poller, poller, self\-monitoring, snmp\ trapper, task\ manager, trapper, unreachable\ poller, vmware\ collector) +All processes of specified type (configuration\ syncer, data\ sender, discoverer, heartbeat\ sender, history\ syncer, housekeeper, http\ poller, icmp\ pinger, ipmi\ manager, ipmi\ poller, java\ poller, poller, self\-monitoring, snmp\ trapper, task\ manager, trapper, unreachable\ poller, vmware\ collector, history\ poller, availability\ manager) .RE .RS 4 .TP 4 diff --git a/man/zabbix_server.man b/man/zabbix_server.man index 48a737aeb65..823f6f0d7ad 100644 --- a/man/zabbix_server.man +++ b/man/zabbix_server.man @@ -111,7 +111,7 @@ Log level control targets .RS 4 .TP 4 .I process\-type -All processes of specified type (alerter, alert\ manager, configuration\ syncer, discoverer, escalator, history\ syncer, housekeeper, http\ poller, icmp\ pinger, ipmi\ manager, ipmi\ poller, java\ poller, lld\ manager, lld\ worker, poller, preprocessing\ manager, preprocessing\ worker, proxy\ poller, self\-monitoring, snmp\ trapper, task\ manager, timer, trapper, unreachable\ poller, vmware\ collector) +All processes of specified type (alerter, alert\ manager, configuration\ syncer, discoverer, escalator, history\ syncer, housekeeper, http\ poller, icmp\ pinger, ipmi\ manager, ipmi\ poller, java\ poller, lld\ manager, lld\ worker, poller, preprocessing\ manager, preprocessing\ worker, proxy\ poller, self\-monitoring, snmp\ trapper, task\ manager, timer, trapper, unreachable\ poller, vmware\ collector, history\ poller, availability\ manager) .RE .RS 4 .TP 4 diff --git a/src/libs/zbxdbcache/dbcache.c b/src/libs/zbxdbcache/dbcache.c index 161fbb4c0c0..27cfb71a5b3 100644 --- a/src/libs/zbxdbcache/dbcache.c +++ b/src/libs/zbxdbcache/dbcache.c @@ -38,7 +38,6 @@ #include "zbxhistory.h" #include "daemon.h" #include "../../zabbix_server/availability/availability.h" -#include "../../zabbix_server/availability/avail_protocol.h" static zbx_mem_info_t *hc_index_mem = NULL; static zbx_mem_info_t *hc_mem = NULL; diff --git a/src/libs/zbxdbhigh/proxy.c b/src/libs/zbxdbhigh/proxy.c index da07d060b86..871fd058f54 100644 --- a/src/libs/zbxdbhigh/proxy.c +++ b/src/libs/zbxdbhigh/proxy.c @@ -34,7 +34,6 @@ #include "events.h" #include "zbxvault.h" #include "../../zabbix_server/availability/availability.h" -#include "../../zabbix_server/availability/avail_protocol.h" extern char *CONFIG_SERVER; extern char *CONFIG_VAULTDBPATH; diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index 51aa326028b..210dcd3276e 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -183,7 +183,7 @@ int CONFIG_PREPROCESSOR_FORKS = 3; int CONFIG_LLDMANAGER_FORKS = 0; int CONFIG_LLDWORKER_FORKS = 0; int CONFIG_ALERTDB_FORKS = 0; -int CONFIG_HISTORYPOLLER_FORKS = 5; +int CONFIG_HISTORYPOLLER_FORKS = 1; /* for zabbix[proxy_history] internal check */ int CONFIG_AVAILMAN_FORKS = 1; int CONFIG_LISTEN_PORT = ZBX_DEFAULT_SERVER_PORT; |