Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'conf/zabbix_proxy.conf')
-rw-r--r--conf/zabbix_proxy.conf37
1 files changed, 34 insertions, 3 deletions
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf
index 6ca35e7e5f2..964db481ac6 100644
--- a/conf/zabbix_proxy.conf
+++ b/conf/zabbix_proxy.conf
@@ -126,7 +126,7 @@ LogFile=/tmp/zabbix_proxy.log
DBName=zabbix_proxy
### Option: DBSchema
-# Schema name. Used for IBM DB2.
+# Schema name. Used for IBM DB2 and PostgreSQL.
#
# Mandatory: no
# Default:
@@ -230,7 +230,9 @@ DBUser=root
# StartIPMIPollers=0
### Option: StartPollersUnreachable
-# Number of pre-forked instances of pollers for unreachable hosts (including IPMI).
+# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java).
+# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers
+# are started.
#
# Mandatory: no
# Range: 0-1000
@@ -346,7 +348,10 @@ DBUser=root
### Option: HousekeepingFrequency
# How often Zabbix will perform housekeeping procedure (in hours).
-# Housekeeping is removing unnecessary information from history, alert, and alarms tables.
+# Housekeeping is removing unnecessary information from proxy history tables.
+# To prevent housekeeper from being overloaded, no more than 4xHousekeepingFrequency hours
+# of outdated history are deleted in one housekeeping cycle.
+# To lower load on proxy startup housekeeping is postponed for 30 minutes after proxy start.
#
# Mandatory: no
# Range: 1-24
@@ -506,6 +511,32 @@ DBUser=root
# Include=/usr/local/etc/zabbix_proxy.general.conf
# Include=/usr/local/etc/zabbix_proxy.conf.d/
+# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf
+
+### Option: SSLCertLocation
+# Location of SSL client certificates.
+# This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLCertLocation=${datadir}/zabbix/ssl/certs
+
+### Option: SSLKeyLocation
+# Location of private keys for SSL client certificates.
+# This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLKeyLocation=${datadir}/zabbix/ssl/keys
+
+### Option: SSLCALocation
+# Location of certificate authority (CA) files for SSL server certificate verification.
+# If not set, system-wide directory will be used.
+# This parameter is used only in web monitoring.
+#
+# Mandatory: no
+# Default:
+# SSLCALocation=
####### LOADABLE MODULES #######