d8a5c20913
zabbix-extra-network: a detection rule with the ifname (eth0.1) and the network name (wan). zabbix-extra-wifi: an universal detection rule for wifi (using libuci-lua) and many userparameters (using libiwinfo-lua) zabbix-extra-mac80211: a phy (phy0) detection rule and userparameters for mac80211 devices zabbix-extra-network and zabbix-extra-wifi will work as non root user if /etc/config/wireless and /etc/config/network are world-readeable (default) (see http://nbd.name/gitweb.cgi?p=uci.git;a=commit;h=07d6fd66f6a20e35490bc8b55d26fdb389016120) zabbix-extra-mac80211 come with a suid helper so that you can still run zabbix as non root user. Ready to use templates are available here: http://wiki.openwrt.org/doc/howto/zabbix Please delete files/zabbix_agentd.conf, it's an empty file. Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr> git-svn-id: svn://svn.openwrt.org/openwrt/packages@36740 3c298f89-4303-0410-b956-a3cf2f4a3e73
62 lines
1.3 KiB
Diff
62 lines
1.3 KiB
Diff
--- a/conf/zabbix_agentd.conf
|
|
+++ b/conf/zabbix_agentd.conf
|
|
@@ -3,12 +3,8 @@
|
|
|
|
############ GENERAL PARAMETERS #################
|
|
|
|
-### Option: PidFile
|
|
-# Name of PID file.
|
|
-#
|
|
-# Mandatory: no
|
|
-# Default:
|
|
-# PidFile=/tmp/zabbix_agentd.pid
|
|
+# Only /var/run/zabbix_agentd.pid supported
|
|
+PidFile=/var/run/zabbix_agentd.pid
|
|
|
|
### Option: LogFile
|
|
# Name of log file.
|
|
@@ -18,8 +14,6 @@
|
|
# Default:
|
|
# LogFile=
|
|
|
|
-LogFile=/tmp/zabbix_agentd.log
|
|
-
|
|
### Option: LogFileSize
|
|
# Maximum size of log file in MB.
|
|
# 0 - disable automatic log rotation.
|
|
@@ -105,6 +99,7 @@ Server=127.0.0.1
|
|
# Range: 0-100
|
|
# Default:
|
|
# StartAgents=3
|
|
+StartAgents=1
|
|
|
|
##### Active checks related
|
|
|
|
@@ -120,8 +115,6 @@ Server=127.0.0.1
|
|
# Default:
|
|
# ServerActive=
|
|
|
|
-ServerActive=127.0.0.1
|
|
-
|
|
### Option: Hostname
|
|
# Unique, case sensitive hostname.
|
|
# Required for active checks and must match hostname as configured on the server.
|
|
@@ -131,8 +124,6 @@ ServerActive=127.0.0.1
|
|
# Default:
|
|
# Hostname=
|
|
|
|
-Hostname=Zabbix server
|
|
-
|
|
### Option: HostnameItem
|
|
# Item used for generating Hostname if it is undefined.
|
|
# Ignored if Hostname is defined.
|
|
@@ -213,7 +204,7 @@ Hostname=Zabbix server
|
|
# Include=
|
|
|
|
# Include=/usr/local/etc/zabbix_agentd.userparams.conf
|
|
-# Include=/usr/local/etc/zabbix_agentd.conf.d/
|
|
+Include=/etc/zabbix_agentd.conf.d/
|
|
|
|
####### USER-DEFINED MONITORED PARAMETERS #######
|
|
|