summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorsasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-02-01 14:11:30 +0000
committersasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-02-01 14:11:30 +0000
commitece7676a15f9e1f605ba673951d32c20b77d81cf (patch)
tree5013b0415a45dfdce92cb81ebff16fa5535275fa /misc
parentd4ad33f2293ea6b8efb2f88b728b0835850e6085 (diff)
downloadzabbix-ece7676a15f9e1f605ba673951d32c20b77d81cf.tar.gz
zabbix-ece7676a15f9e1f605ba673951d32c20b77d81cf.tar.xz
zabbix-ece7676a15f9e1f605ba673951d32c20b77d81cf.zip
- [ZBX-182] ICMP using host names
[svn merge svn://svn.zabbix.com/branches/1.4 -r5304:5308] git-svn-id: svn://svn.zabbix.com/trunk@5309 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'misc')
-rw-r--r--misc/conf/zabbix_server.conf6
1 files changed, 5 insertions, 1 deletions
diff --git a/misc/conf/zabbix_server.conf b/misc/conf/zabbix_server.conf
index ec85ac31..171378f9 100644
--- a/misc/conf/zabbix_server.conf
+++ b/misc/conf/zabbix_server.conf
@@ -110,10 +110,14 @@ AlertScriptsPath=/home/zabbix/bin/
# Location of external scripts
#ExternalScripts=/etc/zabbix/externalscripts
-# Location of 'fping. Default is /usr/sbin/fping
+# Location of fping. Default is /usr/sbin/fping
# Make sure that fping binary has root permissions and SUID flag set
#FpingLocation=/usr/sbin/fping
+# Location of fping6. Default is /usr/sbin/fping6
+# Make sure that fping binary has root permissions and SUID flag set
+#Fping6Location=/usr/sbin/fping6
+
# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds.
#PingerFrequency=60