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>2022-07-06 18:32:08 +0300
committerVladislavs Sokurenko <vladislavs.sokurenko@zabbix.com>2022-07-06 18:35:16 +0300
commitc4d4ee6b9a866873af9206459a1861ec0245397a (patch)
tree810e05385ceb1692d123d8dfd50aa04649d31f47 /conf
parent1d3dbc4cdb4e32988102a3461e33ce825d55e3ac (diff)
.D........ [ZBX-21020] improved "ServerActive" configuration option description
.D........ [ZBX-21020] improved "ServerActive" configuration option description * commit 'd5b359a90003d6078e6e5b501084ccc8520dbf17': .D........ [ZBX-21020] improved ServerActive configuration option description .D........ [ZBX-21020] improved "ServerActive" configuration option description (cherry picked from commit 48ea6dcd3042dce9ff9ffd9e5d368ebbb155a025) (cherry picked from commit c003fd1d1571d4c172748c7007a1cb7bb1466f16)
Diffstat (limited to 'conf')
-rw-r--r--conf/zabbix_agentd.conf10
-rw-r--r--conf/zabbix_agentd.win.conf10
2 files changed, 16 insertions, 4 deletions
diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf
index 6365c8f93aa..28874f94274 100644
--- a/conf/zabbix_agentd.conf
+++ b/conf/zabbix_agentd.conf
@@ -140,12 +140,18 @@ Server=127.0.0.1
##### Active checks related
### Option: ServerActive
-# 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.
+# Zabbix server/proxy address or cluster configuration to get active checks from.
+# Server/proxy address is IP address or DNS name and optional port separated by colon.
+# Cluster configuration is one or more server addresses separated by semicolon.
+# Multiple Zabbix servers/clusters and Zabbix proxies can be specified, separated by comma.
+# More than one Zabbix proxy should not be specified from each Zabbix server/cluster.
+# If Zabbix proxy is specified then Zabbix server/cluster for that proxy should not be specified
# 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 for Zabbix proxy:
+# ServerActive=127.0.0.1:10051
# Example for multiple servers:
# ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]
# Example for HA:
diff --git a/conf/zabbix_agentd.win.conf b/conf/zabbix_agentd.win.conf
index 04cf0de12e1..6a3e5f739bb 100644
--- a/conf/zabbix_agentd.win.conf
+++ b/conf/zabbix_agentd.win.conf
@@ -132,12 +132,18 @@ Server=127.0.0.1
##### Active checks related
### Option: ServerActive
-# 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.
+# Zabbix server/proxy address or cluster configuration to get active checks from.
+# Server/proxy address is IP address or DNS name and optional port separated by colon.
+# Cluster configuration is one or more server addresses separated by semicolon.
+# Multiple Zabbix servers/clusters and Zabbix proxies can be specified, separated by comma.
+# More than one Zabbix proxy should not be specified from each Zabbix server/cluster.
+# If Zabbix proxy is specified then Zabbix server/cluster for that proxy should not be specified
# 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 for Zabbix proxy:
+# ServerActive=127.0.0.1:10051
# Example for multiple servers:
# ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]
# Example for HA: