diff options
| author | james_wells <james_wells@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-02 03:41:33 +0000 |
|---|---|---|
| committer | james_wells <james_wells@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-11-02 03:41:33 +0000 |
| commit | b23f31b53d6c88c31e6142f9a21d3815a580114c (patch) | |
| tree | c738e01687e0a55172ff25082c22ec0b06c6d44c /misc/conf/zabbix_agentd.conf | |
| parent | 8bbda1139ac3e396a1af764a3d3ca5d6fa4f7040 (diff) | |
| download | zabbix-b23f31b53d6c88c31e6142f9a21d3815a580114c.tar.gz zabbix-b23f31b53d6c88c31e6142f9a21d3815a580114c.tar.xz zabbix-b23f31b53d6c88c31e6142f9a21d3815a580114c.zip | |
Applied ServerByName patch:
misc/conf/zabbix_agentd.conf
src/libs/zbxnet/security.c
First pass at optimization of MySQL queries on reports page
frontends/php/include/config.inc.php
Fixed Groupid selection in triggers page (James)
frontends/php/include/config.inc.php
frontends/php/tr_status.php
Fixed Update Profile in profiles page (James)
frontends/php/include/profiles.inc.php
Fixed Number Of Hosts in reports page (James)
frontends/php/include/config.inc.php
frontends/php/report1.php
frontends/php/include/locales/de_de.inc.php
frontends/php/include/locales/en_gb.inc.php
frontends/php/include/locales/fr_fr.inc.php
frontends/php/include/locales/it_it.inc.php
frontends/php/include/locales/ja_jp.inc.php
frontends/php/include/locales/lv_lv.inc.php
frontends/php/include/locales/ru_ru.inc.php
frontends/php/include/locales/sp_sp.inc.php
git-svn-id: svn://svn.zabbix.com/trunk@2241 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'misc/conf/zabbix_agentd.conf')
| -rw-r--r-- | misc/conf/zabbix_agentd.conf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/misc/conf/zabbix_agentd.conf b/misc/conf/zabbix_agentd.conf index c65cb33b..f51ecce5 100644 --- a/misc/conf/zabbix_agentd.conf +++ b/misc/conf/zabbix_agentd.conf @@ -3,8 +3,10 @@ ############ GENERAL PARAMETERS ################# -# List of comma delimited IP addresses of ZABBIX servers. No spaces allowed. -# First IP is used for sending active checks. +# List of comma delimited IP addresses (or hostnames) of ZABBIX servers. +# No spaces allowed. First entry is used for sending active checks. +# Note that hostnames must resolve hostname->IP address and +# IP address->hostname. Server=127.0.0.1 |