OpenWrt/openwrt-packages
1
0
Fork 0
mirror of http://git.openwrt.org/packages.git synced 2025-01-09 04:19:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

zabbix: preserve conffile over sysupgrade

Browse Source 
while doing a sysupgrade the conffile was lost because:
- the path in the Makefile is incorrect
- the parametrized /conffiles  define doesn't seem to work for me

So I added a /conffiles define for every zabbix component and corrected
the path. I think the path changed while upgrading to 2.0.0.

I also had an issue with "hostname" and "uname" not being present on my
system, so I added selects onto these busybox-applets if the native
tool is not installed. Zabbix could also call lsusb and lspci, but I
think it's okay if these calls don't work on an embedded device.

Additionally I deleted an old conffile "files/zabbix_agentd.conf"
which is unused since changeset 32497 (level up zabbix to version 2.0.0)

Signed-off-by: Stefan Hellermann <stefan@the2masters.de>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@34491 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-12-04 16:20:59 +00:00
parent 3b78f9a06a
commit 44c1043ce2
2 changed files with 16 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
admin/zabbix/Makefile
View File

@ -63,6 +63,11 @@ define Package/zabbix-proxy
DEPENDS += +libsqlite3
endef
define Package/zabbix-agentd/config
select BUSYBOX_CONFIG_HOSTNAME if !PACKAGE_net-tools-hostname
select BUSYBOX_CONFIG_UNAME if !PACKAGE_coreutils-uname
endef
CONFIGURE_ARGS+= \
--enable-agent \
--enable-server \
@ -108,8 +113,17 @@ define Package/zabbix/install/init.d
$(1)/etc/init.d/zabbix_$(2)
endef
define Package/zabbix-$(1)/conffiles
/etc/zabbix/zabbix_$(1).conf
define Package/zabbix-agent/conffiles
/etc/zabbix_agent.conf
endef
define Package/zabbix-agentd/conffiles
/etc/zabbix_agentd.conf
endef
define Package/zabbix-server/conffiles
/etc/zabbix_server.conf
endef
define Package/zabbix-proxy/conffiles
/etc/zabbix_proxy.conf
endef
define Package/zabbix-agent/install

85
admin/zabbix/files/zabbix_agentd.conf
View File

@ -1,85 +0,0 @@
# This is config file for zabbix_agentd
# To get more information about ZABBIX, go http://www.zabbix.com
############ GENERAL PARAMETERS #################
# 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
# Server port for sending active checks
#ServerPort=10051
# Unique hostname. Required for active checks.
Hostname=localhost
# Listen port. Default is 10050
#ListenPort=10050
# IP address to bind agent
# If missing, bind to all available IPs
#ListenIP=127.0.0.1
# Number of pre-forked instances of zabbix_agentd.
# Default value is 5
# This parameter must be between 1 and 16
StartAgents=5
# How often refresh list of active checks. 2 minutes by default.
#RefreshActiveChecks=120
# Disable active checks. The agent will work in passive mode listening server.
#DisableActive=1
# Enable remote commands for ZABBIX agent. By default remote commands disabled.
#EnableRemoteCommands=1
# Specifies debug level
# 0 - debug is not created
# 1 - critical information
# 2 - error information
# 3 - warnings
# 4 - information (default)
# 5 - for debugging (produces lots of information)
DebugLevel=3
# Name of PID file
PidFile=/var/run/zabbix/zabbix_agentd.pid
# Name of log file.
# If not set, syslog will be used
LogFile=/var/log/zabbix/zabbix_agentd.log
# Spend no more than Timeout seconds on processing
# Must be between 1 and 30
Timeout=3
####### USER-DEFINED MONITORED PARAMETERS #######
# Format: UserParameter=<key>,<shell command>
# Note that shell command must not return empty string or EOL only
#UserParameter=system.test,who|wc -l
### Set of parameter for monitoring MySQL server (v3.23.42 and later)
### Change -u<username> and add -p<password> if required
#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
#UserParameter=mysql.version,mysql -V