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
path: root/conf
diff options
context:
space:
mode:
authorVladislavs Sokurenko <vladislavs.sokurenko@zabbix.com>2021-10-22 12:48:03 +0300
committerVladislavs Sokurenko <vladislavs.sokurenko@zabbix.com>2021-10-22 12:48:03 +0300
commit41547e562232974023a754208f855b8374435750 (patch)
tree9413ced78194bb5846248794eaa786a67b06e091 /conf
parentd40b23946191bac2934a3edc484d59863ca719c8 (diff)
.D........ [ZBXNEXT-6923] updated Server and ServerActive parameter description
Diffstat (limited to 'conf')
-rw-r--r--conf/zabbix_agentd.conf11
-rw-r--r--conf/zabbix_proxy.conf13
2 files changed, 11 insertions, 13 deletions
diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf
index d1b370a18ab..8a1fa13f281 100644
--- a/conf/zabbix_agentd.conf
+++ b/conf/zabbix_agentd.conf
@@ -140,13 +140,18 @@ Server=127.0.0.1
##### Active checks related
### Option: ServerActive
-# List of comma delimited IP:port (or DNS name:port) pairs of Zabbix servers and Zabbix proxies for active checks.
+# List of comma delimited IP addresses or DNS names (address:port) pairs or clusters (address:port;address2:port) of Zabbix servers and Zabbix proxies for active checks.
# If port is not specified, default port is used.
+# Cluster nodes need be separated by semicolon.
# IPv6 addresses must be enclosed in square brackets if port for that host is specified.
# If port is not specified, square brackets for IPv6 addresses are optional.
# If this parameter is not specified, active checks are disabled.
-# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]
-#
+# Example for multiple servers:
+# ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]
+# Example for HA:
+# ServerActive=zabbix.cluster.node1;zabbix.cluster.node2:20051;zabbix.cluster.node3
+# Example for HA with two clusters and one server:
+# ServerActive=zabbix.cluster.node1;zabbix.cluster.node2:20051,zabbix.cluster2.node1;zabbix.cluster2.node2,zabbix.domain
# Mandatory: no
# Default:
# ServerActive=
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf
index 81a0c8a6aad..36fde4d0364 100644
--- a/conf/zabbix_proxy.conf
+++ b/conf/zabbix_proxy.conf
@@ -14,7 +14,9 @@
### Option: Server
# If ProxyMode is set to active mode:
-# IP address or DNS name of Zabbix server to get configuration data from and send data to.
+# IP address or DNS name (address:port) or cluster (address:port;address2:port) of Zabbix server to get configuration data from and send data to.
+# If port is not specified, default port is used.
+# Cluster nodes need to be separated by semicolon.
# If ProxyMode is set to passive mode:
# List of comma delimited IP addresses, optionally in CIDR notation, or DNS names of Zabbix server.
# Incoming connections will be accepted only from the addresses listed here.
@@ -29,15 +31,6 @@
Server=127.0.0.1
-### Option: ServerPort
-# Port of Zabbix trapper on Zabbix server.
-# For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ServerPort=10051
-
### Option: Hostname
# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server!
# Value is acquired from HostnameItem if undefined.