~alpine/devel

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
1

[alpine-devel] [PATCH] main/zabbix: moved from testing

Duane Hughes <duanejevon@gmail.com>
Details
Message ID
<1291620160-21784-1-git-send-email-duanejevon@gmail.com>
Sender timestamp
1291620160
DKIM signature
missing
Download raw message
Patch: +862 -862
fixes #251
---
 main/zabbix/APKBUILD                    |  107 ++++++++++++++
 main/zabbix/zabbix-agent.pre-install    |    5 +
 main/zabbix/zabbix-agentd.initd         |   22 +++
 main/zabbix/zabbix-dn_skipname.patch    |   44 ++++++
 main/zabbix/zabbix-getloadavg.patch     |   33 +++++
 main/zabbix/zabbix-proxy.initd          |   21 +++
 main/zabbix/zabbix-server.initd         |   21 +++
 main/zabbix/zabbix.pre-install          |    5 +
 main/zabbix/zabbix_agentd.conf          |  230 +++++++++++++++++++++++++++++++
 main/zabbix/zabbix_proxy.conf           |  175 +++++++++++++++++++++++
 main/zabbix/zabbix_server.conf          |  155 +++++++++++++++++++++
 main/zabbix/zabbix_trapper.conf         |   44 ++++++
 testing/zabbix/APKBUILD                 |  107 --------------
 testing/zabbix/zabbix-agent.pre-install |    5 -
 testing/zabbix/zabbix-agentd.initd      |   22 ---
 testing/zabbix/zabbix-dn_skipname.patch |   44 ------
 testing/zabbix/zabbix-getloadavg.patch  |   33 -----
 testing/zabbix/zabbix-proxy.initd       |   21 ---
 testing/zabbix/zabbix-server.initd      |   21 ---
 testing/zabbix/zabbix.pre-install       |    5 -
 testing/zabbix/zabbix_agentd.conf       |  230 -------------------------------
 testing/zabbix/zabbix_proxy.conf        |  175 -----------------------
 testing/zabbix/zabbix_server.conf       |  155 ---------------------
 testing/zabbix/zabbix_trapper.conf      |   44 ------
 24 files changed, 862 insertions(+), 862 deletions(-)
 create mode 100644 main/zabbix/APKBUILD
 create mode 100644 main/zabbix/zabbix-agent.pre-install
 create mode 100644 main/zabbix/zabbix-agentd.initd
 create mode 100644 main/zabbix/zabbix-dn_skipname.patch
 create mode 100644 main/zabbix/zabbix-getloadavg.patch
 create mode 100644 main/zabbix/zabbix-proxy.initd
 create mode 100644 main/zabbix/zabbix-server.initd
 create mode 100644 main/zabbix/zabbix.pre-install
 create mode 100644 main/zabbix/zabbix_agentd.conf
 create mode 100644 main/zabbix/zabbix_proxy.conf
 create mode 100644 main/zabbix/zabbix_server.conf
 create mode 100644 main/zabbix/zabbix_trapper.conf
 delete mode 100644 testing/zabbix/APKBUILD
 delete mode 100644 testing/zabbix/zabbix-agent.pre-install
 delete mode 100644 testing/zabbix/zabbix-agentd.initd
 delete mode 100644 testing/zabbix/zabbix-dn_skipname.patch
 delete mode 100644 testing/zabbix/zabbix-getloadavg.patch
 delete mode 100644 testing/zabbix/zabbix-proxy.initd
 delete mode 100644 testing/zabbix/zabbix-server.initd
 delete mode 100644 testing/zabbix/zabbix.pre-install
 delete mode 100644 testing/zabbix/zabbix_agentd.conf
 delete mode 100644 testing/zabbix/zabbix_proxy.conf
 delete mode 100644 testing/zabbix/zabbix_server.conf
 delete mode 100644 testing/zabbix/zabbix_trapper.conf

diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD
new file mode 100644
index 0000000..2c28099
--- /dev/null
+++ b/main/zabbix/APKBUILD
@@ -0,0 +1,107 @@
# Contributor: Jeff Bilyk <jbilyk at gmail> 
# Maintainer: Natanael Copa <natanael.copa@gmail.com>
pkgname=zabbix
pkgver=1.8.3
pkgrel=1
pkgdesc="Enterprise-class open source distributed monitoring"
url="www.zabbix.com"
license="GPL"
depends="php php-pgsql php-gd php-curl php-bcmath php-sockets php-iconv fping"
makedepends="postgresql-dev curl-dev libiconv-dev net-snmp-dev"
install="$pkgname.pre-install"
pkgusers="zabbix"
pkggroups="zabbix"
subpackages="$pkgname-doc $pkgname-agent"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
	zabbix_server.conf
	zabbix_trapper.conf
	zabbix_proxy.conf
	zabbix_agentd.conf
	zabbix-dn_skipname.patch
	zabbix-getloadavg.patch
	zabbix-server.initd
	zabbix-agentd.initd
	zabbix-proxy.initd
	"

_builddir="$srcdir"/$pkgname-$pkgver

prepare() {
	cd "$_builddir"
	for i in $source; do
		case $i in
		*.patch)
			msg "Applying $i"
			patch -p1 -i "$srcdir"/$i || return 1
			;;
		esac
	done
}

build() {
	cd "$_builddir"
	./configure --prefix=/usr \
		--sysconfdir=/etc \
		--mandir=/usr/share/man \
		--infodir=/usr/share/info \
		--enable-server \
		--enable-agent \
		--enable-proxy \
		--enable-ipv6 \
		--with-pgsql \
		--with-net-snmp \
		--with-libcurl
	make || return 1
}

package() {
	local _wwwdir="$pkgdir"/usr/share/webapps/zabbix
	cd "$_builddir"
	make DESTDIR="$pkgdir" install

	install -d -m0750 -o zabbix -g zabbix \
		"$pkgdir"/var/run/zabbix "$pkgdir"/var/log/zabbix

	install -d "$pkgdir"/etc/zabbix 
	install -d "$pkgdir"/usr/share/zabbix/dbms/create/data
	install -d -m0755 "$_wwwdir"
	install -D -m0644 "$srcdir"/zabbix_server.conf "$pkgdir"/etc/zabbix/zabbix_server.conf
	install -D -m0644 "$srcdir"/zabbix_trapper.conf "$pkgdir"/etc/zabbix/zabbix_trapper.conf
	install -D -m0755 "$srcdir"/zabbix-$pkgver/create/data/data.sql "$pkgdir"/usr/share/zabbix/dbms/create/data/data.sql
	install -D -m0755 "$srcdir"/zabbix-$pkgver/create/data/images_pgsql.sql "$pkgdir"/usr/share/zabbix/dbms/create/data/images_pgsql.sql
	install -D -m0755 "$srcdir"/zabbix-$pkgver/create/schema/postgresql.sql "$pkgdir"/usr/share/zabbix/dbms/create/postgresql.sql
	cp -r "$srcdir"/zabbix-$pkgver/frontends/php/* "$_wwwdir"
	
	for i in server proxy; do
		install -D -m0755 "$srcdir"/zabbix-$i.initd \
			"$pkgdir"/etc/init.d/zabbix-$i || return 1
	done
  
}

agent() {
	pkgdesc="Zabbix Network Monitoring Agent"
	depends=
	install="$subpkgname.pre-install"
	
        install -d -m0750 -o zabbix -g zabbix \
                "$subpkgdir"/var/run/zabbix "$subpkgdir"/var/log/zabbix
                        
	install -d "$subpkgdir"/etc/zabbix
	install -D -m0644 "$srcdir"/zabbix_agentd.conf "$subpkgdir"/etc/zabbix/zabbix_agentd.conf
	install -D -m0755 "$srcdir"/zabbix-agentd.initd "$subpkgdir"/etc/init.d/zabbix-agentd

	mkdir -p "$subpkgdir"/usr/sbin
	mv -f "$pkgdir"/usr/sbin/zabbix_agentd "$subpkgdir"/usr/sbin/
}

md5sums="575c31880d73f6fe41e730874ebfc633  zabbix-1.8.3.tar.gz
26b0401a83bdb1dce29338e5b2786620  zabbix_server.conf
9832a81e134c8e2c11e2a06b7adbf88f  zabbix_trapper.conf
0310b92afb3f35c1075fff53db737212  zabbix_proxy.conf
0fe55827fe49424a9f59fd43cc905ae1  zabbix_agentd.conf
d13166483792401be2d25b37b0170b82  zabbix-dn_skipname.patch
8d1d2e53479173aac0df0c38a4d6afda  zabbix-getloadavg.patch
e42394e798ab98a8ff4babe68e04633a  zabbix-server.initd
88374bba8a8fdfabfcfe9be6dd12095f  zabbix-agentd.initd
32abde1cc00c2eeccddb7e038117d0ab  zabbix-proxy.initd"
diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install
new file mode 100644
index 0000000..8a9e519
--- /dev/null
+++ b/main/zabbix/zabbix-agent.pre-install
@@ -0,0 +1,5 @@
#!/bin/sh

addgroup zabbix 2>/dev/null
adduser -S -H -h /dev/null -s /bin/false -D -G zabbix zabbix 2>/dev/null
exit 0
diff --git a/main/zabbix/zabbix-agentd.initd b/main/zabbix/zabbix-agentd.initd
new file mode 100644
index 0000000..b14b5fe
--- /dev/null
+++ b/main/zabbix/zabbix-agentd.initd
@@ -0,0 +1,22 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd,v 1.1 2009/10/05 15:55:23 patrick Exp $

depend() {
	need net
	provide zabbix-agent
	use zabbix-server
}

start() {
	ebegin "Starting Zabbix agent"
	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
	eend $?
}

stop() {
	ebegin "Stopping Zabbix agent"
	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
	eend $?
}
diff --git a/main/zabbix/zabbix-dn_skipname.patch b/main/zabbix/zabbix-dn_skipname.patch
new file mode 100644
index 0000000..df75e91
--- /dev/null
+++ b/main/zabbix/zabbix-dn_skipname.patch
@@ -0,0 +1,44 @@
diff --git a/src/libs/zbxsysinfo/common/net.c b/src/libs/zbxsysinfo/common/net.c
index c8956a6..645fd8c 100644
--- a/src/libs/zbxsysinfo/common/net.c
+++ b/src/libs/zbxsysinfo/common/net.c
@@ -26,6 +26,39 @@
 
 #include "net.h"
 
+#if defined(__UCLIBC__) && defined(HAVE_RES_QUERY)
+/*
+ * Skip over a compressed domain name. Return the size or -1.
+ */
+int
+__dn_skipname(const u_char *comp_dn, const u_char *eom)
+{
+       const u_char *cp;
+       int n;
+
+       cp = comp_dn;
+       while (cp < eom && (n = *cp++)) {
+               /*
+                * check for indirection
+                */
+               switch (n & INDIR_MASK) {
+               case 0:                 /* normal case, n == len */
+                       cp += n;
+                       continue;
+               case INDIR_MASK:        /* indirection */
+                       cp++;
+                       break;
+               default:                /* illegal type */
+                       return (-1);
+               }
+               break;
+       }
+       if (cp > eom)
+               return (-1);
+       return (cp - comp_dn);
+}
+#endif
+
 /*
  * 0 - NOT OK
  * 1 - OK
diff --git a/main/zabbix/zabbix-getloadavg.patch b/main/zabbix/zabbix-getloadavg.patch
new file mode 100644
index 0000000..44706ab
--- /dev/null
+++ b/main/zabbix/zabbix-getloadavg.patch
@@ -0,0 +1,33 @@
diff --git a/src/libs/zbxsysinfo/linux/cpu.c b/src/libs/zbxsysinfo/linux/cpu.c
index a76e756..9f9031d 100644
--- a/src/libs/zbxsysinfo/linux/cpu.c
+++ b/src/libs/zbxsysinfo/linux/cpu.c
@@ -22,6 +22,28 @@
 #include "sysinfo.h"
 #include "stats.h"
 
+#ifndef HAVE_GETLOADAVG
+/*! \brief Alternative method of getting load avg on Linux only */
+int getloadavg(double *list, int nelem)
+{
+        FILE *LOADAVG;
+        double avg[3] = { 0.0, 0.0, 0.0 };
+        int i, res = -1;
+
+        if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
+                fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
+                res = 0;
+                fclose(LOADAVG);
+        }
+
+        for (i = 0; (i < nelem) && (i < 3); i++) {
+                list[i] = avg[i];
+        }
+
+        return res;
+}
+#endif
+
 int	SYSTEM_CPU_NUM(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	char	mode[32];
diff --git a/main/zabbix/zabbix-proxy.initd b/main/zabbix/zabbix-proxy.initd
new file mode 100644
index 0000000..8ac246e
--- /dev/null
+++ b/main/zabbix/zabbix-proxy.initd
@@ -0,0 +1,21 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy,v 1.1 2009/10/06 16:24:35 patrick Exp $

depend() {
	need net
	#use mysql postgresql
}

start() {
	ebegin "Starting Zabbix proxy"
	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_proxy
	eend $?
}

stop() {
	ebegin "Stopping Zabbix proxy"
	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_proxy.pid
	eend $?
}
diff --git a/main/zabbix/zabbix-server.initd b/main/zabbix/zabbix-server.initd
new file mode 100644
index 0000000..a661cd2
--- /dev/null
+++ b/main/zabbix/zabbix-server.initd
@@ -0,0 +1,21 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v 1.1 2009/10/05 15:55:23 patrick Exp $

depend() {
	need net
	use mysql postgresql
}

start() {
	ebegin "Starting Zabbix server"
	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
	eend $?
}

stop() {
	ebegin "Stopping Zabbix server"
	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
	eend $?
}
diff --git a/main/zabbix/zabbix.pre-install b/main/zabbix/zabbix.pre-install
new file mode 100644
index 0000000..8a9e519
--- /dev/null
+++ b/main/zabbix/zabbix.pre-install
@@ -0,0 +1,5 @@
#!/bin/sh

addgroup zabbix 2>/dev/null
adduser -S -H -h /dev/null -s /bin/false -D -G zabbix zabbix 2>/dev/null
exit 0
diff --git a/main/zabbix/zabbix_agentd.conf b/main/zabbix/zabbix_agentd.conf
new file mode 100644
index 0000000..8b56407
--- /dev/null
+++ b/main/zabbix/zabbix_agentd.conf
@@ -0,0 +1,230 @@
# This is a config file for Zabbix Agent (Unix)
# To get more information about Zabbix, visit http://www.zabbix.com

############ GENERAL PARAMETERS #################

### Option: PidFile
#	Name of PID file.
#
# Mandatory: no
# Default:
PidFile=/var/run/zabbix/zabbix_agentd.pid

### Option: LogFile
#	Name of log file.
#	If not set, syslog is used.
#
# Mandatory: no
# Default:
# LogFile=

LogFile=/var/log/zabbix/zabbix_agentd.log

### Option: LogFileSize
#	Maximum size of log file in MB.
#	0 - disable automatic log rotation.
#
# Mandatory: no
# Range: 0-1024
# Default:
# LogFileSize=1

### Option: DebugLevel
#	Specifies debug level
#	0 - no debug
#	1 - critical information
#	2 - error information
#	3 - warnings
#	4 - for debugging (produces lots of information)
#
# Mandatory: no
# Range: 0-4
# Default:
# DebugLevel=3

### Option: SourceIP
#	Source IP address for outgoing connections.
#
# Mandatory: no
# Default:
# SourceIP=

### Option: EnableRemoteCommands
#	Whether remote commands from Zabbix server are allowed.
#	0 - not allowed
#	1 - allowed
#
# Mandatory: no
# Default:
# EnableRemoteCommands=0

### Option: LogRemoteCommands
#	Enable logging of executed shell commands as warnings
#	0 - disabled
#	1 - enabled
#
# Mandatory: no
# Default:
# LogRemoteCommands=0

##### Passive checks related

### Option: Server
#	List of comma delimited IP addresses (or hostnames) of Zabbix servers.
#	No spaces allowed. First entry is used for receiving list of and sending active checks.
#	Note that hostnames must resolve hostname->IP address and IP address->hostname.
#	If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally.
#
# Mandatory: yes
# Default:
# Server=

Server=

### Option: Hostname
#	Unique, case sensitive hostname.
#	Required for active checks and must match hostname as configured on the server.
#
# Default:
# Hostname=system.uname

Hostname=

### Option: ListenPort
#	Agent will listen on this port for connections from the server.
#
# Mandatory: no
# Range: 1024-32767
# Default:
# ListenPort=10050

### Option: ListenIP
#	List of comma delimited IP addresses that the agent should listen on.
#
# Mandatory: no
# Default:
# ListenIP=0.0.0.0

# ListenIP=127.0.0.1

### Option: DisablePassive
#	Disable passive checks. The agent will not listen on any TCP port.
#	Only active checks will be processed.
#	0 - do not disable
#	1 - disable
#
# Mandatory: no
# Default:
# DisablePassive=0

##### Active checks related

### Option: DisableActive
#	Disable active checks. The agent will work in passive mode listening for server.
#
# Mandatory: no
# Default:
# DisableActive=0

# DisableActive=1

### Option: ServerPort
#	Server port for retrieving list of and  sending active checks.
#
# Mandatory: no
# Default:
# ServerPort=10051

### Option: RefreshActiveChecks
#	How often list of active checks is refreshed, in seconds.
#
# Mandatory: no
# Range: 60-3600
# Default:
# RefreshActiveChecks=120

### Option: BufferSend
#	Do not keep data longer than N seconds in buffer.
#
# Mandatory: no
# Range: 1-3600
# Default:
# BufferSend=5

### Option: BufferSize
#	Maximum number of values in a memory buffer. The agent will send
#	all collected data to Zabbix Server or Proxy if the buffer is full.
#
# Mandatory: no
# Range: 2-65535
# Default:
# BufferSize=100

### Option: MaxLinesPerSecond
#	Maximum number of new lines the agent will send per second to Zabbix Server
#	or Proxy processing 'log' and 'logrt' active checks.
#	The provided value will be overridden by the parameter 'maxlines',
#	provided in 'log' or 'logrt' item keys.
#
# Mandatory: no
# Range: 1-1000
# Default:
# MaxLinesPerSecond=100


############ ADVANCED PARAMETERS #################

### Option: StartAgents
#	Number of pre-forked instances of zabbix_agentd that process passive checks.
#
# Mandatory: no
# Range: 1-16
# Default:
# StartAgents=3

### Option: Timeout
#	Spend no more than Timeout seconds on processing
#
# Mandatory: no
# Range: 1-30
# Default:
# Timeout=3

### Option: Include
#	You may include individual files or all files in a directory in the configuration file.
#
# Mandatory: no
# Default:
# Include=

# Include=/etc/zabbix/zabbix_agent.userparams.conf
# Include=/etc/zabbix/zabbix_agentd/


####### USER-DEFINED MONITORED PARAMETERS #######

### Option: UnsafeUserParameters
#	Allow all characters to be passed in arguments to user-defined parameters.
#	0 - do not allow
#	1 - allow
#
# Mandatory: no
# Range: 0-1
# Default:
# UnsafeUserParameters=0

### Option: UserParameter
#	User-defined parameter to monitor. There can be several user-defined parameters.
#	Format: UserParameter=<key>,<shell command>
#	Note that shell command must not return empty string or EOL only.
#	Example: UserParameter=system.test,who|wc -l
#UserParameter=system.test,who|wc -l
### Set of parameters 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
diff --git a/main/zabbix/zabbix_proxy.conf b/main/zabbix/zabbix_proxy.conf
new file mode 100644
index 0000000..899fac2
--- /dev/null
+++ b/main/zabbix/zabbix_proxy.conf
@@ -0,0 +1,175 @@
# This is config file for ZABBIX server process
# To get more information about ZABBIX, 
# go http://www.zabbix.com

############ GENERAL PARAMETERS #################

# IP address (or hostname) of ZABBIX servers. 

Server=127.0.0.1

# Server port for sending active checks

ServerPort=10051

# Unique hostname.

Hostname=proxy

# Number of pre-forked instances of pollers
# Default value is 5
# This parameter must be between 0 and 255
#StartPollers=5

# Number of pre-forked instances of IPMI pollers
# Default value is 0
# This parameter must be between 0 and 255
#StartIPMIPollers=0

# Number of pre-forked instances of pollers for unreachable hosts
# Default value is 1
# This parameter must be between 0 and 255
#StartPollersUnreachable=1

# Number of pre-forked instances of trappers
# Default value is 5
# This parameter must be between 0 and 255
#StartTrappers=5

# Number of pre-forked instances of ICMP pingers
# Default value is 1
# This parameter must be between 0 and 255
#StartPingers=1

# Number of pre-forked instances of discoverers
# Default value is 1
# This parameter must be between 0 and 255
#StartDiscoverers=1

# Number of pre-forked instances of HTTP pollers
# Default value is 1
# This parameter must be between 0 and 255
#StartHTTPPollers=1

# Listen port for trapper. Default port number is 10051. This parameter 
# must be between 1024 and 32767
#ListenPort=10051

# Source IP address for outgouing connections
#SourceIP=

# Listen interface for trapper. Trapper will listen all network interfaces
# if this parameter is missing.
#ListenIP=127.0.0.1

# How often ZABBIX will perform sending hearbeat message
# (in seconds)
# Default value is 60 seconds
# Set to 0 to disable heartbeat messages
# This parameter must be between 0 and 3600
#HeartbeatFrequency=60

# How often ZABBIX will perform sync configuration data
# (in seconds)
# Default value is 3600 seconds (1h)
# This parameter must be between 1 and 604800 (1 week)
#ConfigFrequency=3600

# How often ZABBIX will perform housekeeping procedure
# (in hours)
# Default value is 1 hour
# Housekeeping is removing unnecessary information from
# tables history, alert, and alarms
# This parameter must be between 1 and 24
#HousekeepingFrequency=1

# How often ZABBIX will try to send unsent alerts
# (in seconds)
# Default value is 30 seconds
#SenderFrequency=30

# Local bufer size in hours. Proxy will keep collected data N hours.
# Default value is 0 hours
#ProxyLocalBuffer=0

# Offline buffer size in hours. It is used when server is not available.
# Older data is removed.
# Default value is 1 hours
#ProxyOfflineBuffer=1

# Specifies debug level
# 0 - debug is not created
# 1 - critical information
# 2 - error information
# 3 - warnings (default)
# 4 - for debugging (produces lots of information)
#DebugLevel=3

# Specifies how long we wait for agent response (in sec)
# Must be between 1 and 30 
Timeout=5

# Specifies how many seconds trapper may spend processing new data
# Must be between 1 and 30 
#TrapperTimeout=5

# After how many seconds of unreachability treat a host as unavailable
#UnreachablePeriod=45

# How ofter check host for availability during the unreachability period
#UnavailableDelay=15

# How ofter check host for availability during the unavailability period
#UnavailableDelay=60

# Name of PID file
PidFile=/var/run/zabbix/zabbix_proxy.pid

# Name of log file
# If not set, syslog is used
LogFile=/var/log/zabbix/zabbix_proxy.log

# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
LogFileSize=1

# Location for custom alert scripts
AlertScriptsPath=/home/zabbix/bin/

# Location of external scripts
#ExternalScripts=/etc/zabbix/externalscripts

# 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

# Temporary directory. Default is /tmp
#TmpDir=/tmp

# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds.
#PingerFrequency=60

# Database host name
# Default is localhost

#DBHost=localhost

# Database name
# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored.
DBName=proxy

# Database user

DBUser=root

# Database password
# Comment this line if no password used

#DBPassword=<password>

# Connect to MySQL using Unix socket?

#DBSocket=/tmp/mysql.sock
diff --git a/main/zabbix/zabbix_server.conf b/main/zabbix/zabbix_server.conf
new file mode 100644
index 0000000..39c12ef
--- /dev/null
+++ b/main/zabbix/zabbix_server.conf
@@ -0,0 +1,155 @@
# This is config file for ZABBIX server process
# To get more information about ZABBIX, 
# go http://www.zabbix.com

############ GENERAL PARAMETERS #################

# This defines unique NodeID in distributed setup,
# Default value 0 (standalone server)
# This parameter must be between 0 and 999
#NodeID=0

# Number of pre-forked instances of pollers
# Default value is 5
# This parameter must be between 0 and 255
#StartPollers=5

# Number of pre-forked instances of IPMI pollers
# Default value is 0
# This parameter must be between 0 and 255
#StartIPMIPollers=0

# Number of pre-forked instances of pollers for unreachable hosts
# Default value is 1
# This parameter must be between 0 and 255
#StartPollersUnreachable=1

# Number of pre-forked instances of trappers
# Default value is 5
# This parameter must be between 0 and 255
#StartTrappers=5

# Number of pre-forked instances of ICMP pingers
# Default value is 1
# This parameter must be between 0 and 255
#StartPingers=1

# Number of pre-forked instances of discoverers
# Default value is 1
# This parameter must be between 0 and 255
#StartDiscoverers=1

# Number of pre-forked instances of HTTP pollers
# Default value is 1
# This parameter must be between 0 and 255
#StartHTTPPollers=1

# Listen port for trapper. Default port number is 10051. This parameter 
# must be between 1024 and 32767

#ListenPort=10051

# Source IP address for outgouing connections
#SourceIP=

# Listen interface for trapper. Trapper will listen all network interfaces
# if this parameter is missing.

#ListenIP=127.0.0.1

# How often ZABBIX will perform housekeeping procedure
# (in hours)
# Default value is 1 hour
# Housekeeping is removing unnecessary information from
# tables history, alert, and alarms
# This parameter must be between 1 and 24

#HousekeepingFrequency=1

# How often ZABBIX will try to send unsent alerts
# (in seconds)
# Default value is 30 seconds
SenderFrequency=30

# Uncomment this line to disable housekeeping procedure
#DisableHousekeeping=1

# Specifies debug level
# 0 - debug is not created
# 1 - critical information
# 2 - error information
# 3 - warnings (default)
# 4 - for debugging (produces lots of information)

DebugLevel=3

# Specifies how long we wait for agent response (in sec)
# Must be between 1 and 30 
Timeout=5

# Specifies how many seconds trapper may spend processing new data
# Must be between 1 and 30 
#TrapperTimeout=5

# After how many seconds of unreachability treat a host as unavailable
#UnreachablePeriod=45

# How ofter check host for availability during the unreachability period
#UnavailableDelay=15

# How ofter check host for availability during the unavailability period
#UnavailableDelay=60

# Name of PID file

PidFile=/var/run/zabbix/zabbix_server.pid

# Name of log file
# If not set, syslog is used

LogFile=/var/log/zabbix/zabbix_server.log

# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
LogFileSize=2

# Location for custom alert scripts
AlertScriptsPath=/home/zabbix/bin/

# Location of external scripts
#ExternalScripts=/etc/zabbix/externalscripts

# 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

# Temporary directory. Default is /tmp
#TmpDir=/tmp

# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds.
#PingerFrequency=60

# Database host name
# Default is localhost

#DBHost=localhost

# Database name
# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored.
DBName=zabbix

# Database user

DBUser=root

# Database password
# Comment this line if no password used

#DBPassword=<password>

# Connect to MySQL using Unix socket?

#DBSocket=/tmp/mysql.sock
diff --git a/main/zabbix/zabbix_trapper.conf b/main/zabbix/zabbix_trapper.conf
new file mode 100644
index 0000000..7f235f6
--- /dev/null
+++ b/main/zabbix/zabbix_trapper.conf
@@ -0,0 +1,44 @@
# This is config file for zabbix_trapper
# To get more information about ZABBIX, 
# go http://www.zabbix.com

############ GENERAL PARAMETERS #################

# Specifies debug level
# 1 - critical information
# 2 - warnings (default)
# 3 - for debugging (produces lots of information)

DebugLevel=2

# Spend no more than Timeout seconds on processing
# Must be between 1 and 30

Timeout=3

# Name of log file
# If not set, syslog will be used

LogFile=/var/log/zabbix/zabbix_trapper.log

# Database host name
# Default is localhost

DBHost=localhost

# Database name

DBName=zabbix

# Database user

DBUser=zabbix

# Database password
# Comment this line if no password used

DBPassword=zabbix

# Connect to MySQL usig Unix socket?

#DBSocket=/tmp/mysql.sock
diff --git a/testing/zabbix/APKBUILD b/testing/zabbix/APKBUILD
deleted file mode 100644
index 2c28099..0000000
--- a/testing/zabbix/APKBUILD
@@ -1,107 +0,0 @@
# Contributor: Jeff Bilyk <jbilyk at gmail> 
# Maintainer: Natanael Copa <natanael.copa@gmail.com>
pkgname=zabbix
pkgver=1.8.3
pkgrel=1
pkgdesc="Enterprise-class open source distributed monitoring"
url="www.zabbix.com"
license="GPL"
depends="php php-pgsql php-gd php-curl php-bcmath php-sockets php-iconv fping"
makedepends="postgresql-dev curl-dev libiconv-dev net-snmp-dev"
install="$pkgname.pre-install"
pkgusers="zabbix"
pkggroups="zabbix"
subpackages="$pkgname-doc $pkgname-agent"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
	zabbix_server.conf
	zabbix_trapper.conf
	zabbix_proxy.conf
	zabbix_agentd.conf
	zabbix-dn_skipname.patch
	zabbix-getloadavg.patch
	zabbix-server.initd
	zabbix-agentd.initd
	zabbix-proxy.initd
	"

_builddir="$srcdir"/$pkgname-$pkgver

prepare() {
	cd "$_builddir"
	for i in $source; do
		case $i in
		*.patch)
			msg "Applying $i"
			patch -p1 -i "$srcdir"/$i || return 1
			;;
		esac
	done
}

build() {
	cd "$_builddir"
	./configure --prefix=/usr \
		--sysconfdir=/etc \
		--mandir=/usr/share/man \
		--infodir=/usr/share/info \
		--enable-server \
		--enable-agent \
		--enable-proxy \
		--enable-ipv6 \
		--with-pgsql \
		--with-net-snmp \
		--with-libcurl
	make || return 1
}

package() {
	local _wwwdir="$pkgdir"/usr/share/webapps/zabbix
	cd "$_builddir"
	make DESTDIR="$pkgdir" install

	install -d -m0750 -o zabbix -g zabbix \
		"$pkgdir"/var/run/zabbix "$pkgdir"/var/log/zabbix

	install -d "$pkgdir"/etc/zabbix 
	install -d "$pkgdir"/usr/share/zabbix/dbms/create/data
	install -d -m0755 "$_wwwdir"
	install -D -m0644 "$srcdir"/zabbix_server.conf "$pkgdir"/etc/zabbix/zabbix_server.conf
	install -D -m0644 "$srcdir"/zabbix_trapper.conf "$pkgdir"/etc/zabbix/zabbix_trapper.conf
	install -D -m0755 "$srcdir"/zabbix-$pkgver/create/data/data.sql "$pkgdir"/usr/share/zabbix/dbms/create/data/data.sql
	install -D -m0755 "$srcdir"/zabbix-$pkgver/create/data/images_pgsql.sql "$pkgdir"/usr/share/zabbix/dbms/create/data/images_pgsql.sql
	install -D -m0755 "$srcdir"/zabbix-$pkgver/create/schema/postgresql.sql "$pkgdir"/usr/share/zabbix/dbms/create/postgresql.sql
	cp -r "$srcdir"/zabbix-$pkgver/frontends/php/* "$_wwwdir"
	
	for i in server proxy; do
		install -D -m0755 "$srcdir"/zabbix-$i.initd \
			"$pkgdir"/etc/init.d/zabbix-$i || return 1
	done
  
}

agent() {
	pkgdesc="Zabbix Network Monitoring Agent"
	depends=
	install="$subpkgname.pre-install"
	
        install -d -m0750 -o zabbix -g zabbix \
                "$subpkgdir"/var/run/zabbix "$subpkgdir"/var/log/zabbix
                        
	install -d "$subpkgdir"/etc/zabbix
	install -D -m0644 "$srcdir"/zabbix_agentd.conf "$subpkgdir"/etc/zabbix/zabbix_agentd.conf
	install -D -m0755 "$srcdir"/zabbix-agentd.initd "$subpkgdir"/etc/init.d/zabbix-agentd

	mkdir -p "$subpkgdir"/usr/sbin
	mv -f "$pkgdir"/usr/sbin/zabbix_agentd "$subpkgdir"/usr/sbin/
}

md5sums="575c31880d73f6fe41e730874ebfc633  zabbix-1.8.3.tar.gz
26b0401a83bdb1dce29338e5b2786620  zabbix_server.conf
9832a81e134c8e2c11e2a06b7adbf88f  zabbix_trapper.conf
0310b92afb3f35c1075fff53db737212  zabbix_proxy.conf
0fe55827fe49424a9f59fd43cc905ae1  zabbix_agentd.conf
d13166483792401be2d25b37b0170b82  zabbix-dn_skipname.patch
8d1d2e53479173aac0df0c38a4d6afda  zabbix-getloadavg.patch
e42394e798ab98a8ff4babe68e04633a  zabbix-server.initd
88374bba8a8fdfabfcfe9be6dd12095f  zabbix-agentd.initd
32abde1cc00c2eeccddb7e038117d0ab  zabbix-proxy.initd"
diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install
deleted file mode 100644
index 8a9e519..0000000
--- a/testing/zabbix/zabbix-agent.pre-install
@@ -1,5 +0,0 @@
#!/bin/sh

addgroup zabbix 2>/dev/null
adduser -S -H -h /dev/null -s /bin/false -D -G zabbix zabbix 2>/dev/null
exit 0
diff --git a/testing/zabbix/zabbix-agentd.initd b/testing/zabbix/zabbix-agentd.initd
deleted file mode 100644
index b14b5fe..0000000
--- a/testing/zabbix/zabbix-agentd.initd
@@ -1,22 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd,v 1.1 2009/10/05 15:55:23 patrick Exp $

depend() {
	need net
	provide zabbix-agent
	use zabbix-server
}

start() {
	ebegin "Starting Zabbix agent"
	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
	eend $?
}

stop() {
	ebegin "Stopping Zabbix agent"
	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
	eend $?
}
diff --git a/testing/zabbix/zabbix-dn_skipname.patch b/testing/zabbix/zabbix-dn_skipname.patch
deleted file mode 100644
index df75e91..0000000
--- a/testing/zabbix/zabbix-dn_skipname.patch
@@ -1,44 +0,0 @@
diff --git a/src/libs/zbxsysinfo/common/net.c b/src/libs/zbxsysinfo/common/net.c
index c8956a6..645fd8c 100644
--- a/src/libs/zbxsysinfo/common/net.c
+++ b/src/libs/zbxsysinfo/common/net.c
@@ -26,6 +26,39 @@
 
 #include "net.h"
 
+#if defined(__UCLIBC__) && defined(HAVE_RES_QUERY)
+/*
+ * Skip over a compressed domain name. Return the size or -1.
+ */
+int
+__dn_skipname(const u_char *comp_dn, const u_char *eom)
+{
+       const u_char *cp;
+       int n;
+
+       cp = comp_dn;
+       while (cp < eom && (n = *cp++)) {
+               /*
+                * check for indirection
+                */
+               switch (n & INDIR_MASK) {
+               case 0:                 /* normal case, n == len */
+                       cp += n;
+                       continue;
+               case INDIR_MASK:        /* indirection */
+                       cp++;
+                       break;
+               default:                /* illegal type */
+                       return (-1);
+               }
+               break;
+       }
+       if (cp > eom)
+               return (-1);
+       return (cp - comp_dn);
+}
+#endif
+
 /*
  * 0 - NOT OK
  * 1 - OK
diff --git a/testing/zabbix/zabbix-getloadavg.patch b/testing/zabbix/zabbix-getloadavg.patch
deleted file mode 100644
index 44706ab..0000000
--- a/testing/zabbix/zabbix-getloadavg.patch
@@ -1,33 +0,0 @@
diff --git a/src/libs/zbxsysinfo/linux/cpu.c b/src/libs/zbxsysinfo/linux/cpu.c
index a76e756..9f9031d 100644
--- a/src/libs/zbxsysinfo/linux/cpu.c
+++ b/src/libs/zbxsysinfo/linux/cpu.c
@@ -22,6 +22,28 @@
 #include "sysinfo.h"
 #include "stats.h"
 
+#ifndef HAVE_GETLOADAVG
+/*! \brief Alternative method of getting load avg on Linux only */
+int getloadavg(double *list, int nelem)
+{
+        FILE *LOADAVG;
+        double avg[3] = { 0.0, 0.0, 0.0 };
+        int i, res = -1;
+
+        if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
+                fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
+                res = 0;
+                fclose(LOADAVG);
+        }
+
+        for (i = 0; (i < nelem) && (i < 3); i++) {
+                list[i] = avg[i];
+        }
+
+        return res;
+}
+#endif
+
 int	SYSTEM_CPU_NUM(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	char	mode[32];
diff --git a/testing/zabbix/zabbix-proxy.initd b/testing/zabbix/zabbix-proxy.initd
deleted file mode 100644
index 8ac246e..0000000
--- a/testing/zabbix/zabbix-proxy.initd
@@ -1,21 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy,v 1.1 2009/10/06 16:24:35 patrick Exp $

depend() {
	need net
	#use mysql postgresql
}

start() {
	ebegin "Starting Zabbix proxy"
	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_proxy
	eend $?
}

stop() {
	ebegin "Stopping Zabbix proxy"
	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_proxy.pid
	eend $?
}
diff --git a/testing/zabbix/zabbix-server.initd b/testing/zabbix/zabbix-server.initd
deleted file mode 100644
index a661cd2..0000000
--- a/testing/zabbix/zabbix-server.initd
@@ -1,21 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v 1.1 2009/10/05 15:55:23 patrick Exp $

depend() {
	need net
	use mysql postgresql
}

start() {
	ebegin "Starting Zabbix server"
	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
	eend $?
}

stop() {
	ebegin "Stopping Zabbix server"
	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
	eend $?
}
diff --git a/testing/zabbix/zabbix.pre-install b/testing/zabbix/zabbix.pre-install
deleted file mode 100644
index 8a9e519..0000000
--- a/testing/zabbix/zabbix.pre-install
@@ -1,5 +0,0 @@
#!/bin/sh

addgroup zabbix 2>/dev/null
adduser -S -H -h /dev/null -s /bin/false -D -G zabbix zabbix 2>/dev/null
exit 0
diff --git a/testing/zabbix/zabbix_agentd.conf b/testing/zabbix/zabbix_agentd.conf
deleted file mode 100644
index 8b56407..0000000
--- a/testing/zabbix/zabbix_agentd.conf
@@ -1,230 +0,0 @@
# This is a config file for Zabbix Agent (Unix)
# To get more information about Zabbix, visit http://www.zabbix.com

############ GENERAL PARAMETERS #################

### Option: PidFile
#	Name of PID file.
#
# Mandatory: no
# Default:
PidFile=/var/run/zabbix/zabbix_agentd.pid

### Option: LogFile
#	Name of log file.
#	If not set, syslog is used.
#
# Mandatory: no
# Default:
# LogFile=

LogFile=/var/log/zabbix/zabbix_agentd.log

### Option: LogFileSize
#	Maximum size of log file in MB.
#	0 - disable automatic log rotation.
#
# Mandatory: no
# Range: 0-1024
# Default:
# LogFileSize=1

### Option: DebugLevel
#	Specifies debug level
#	0 - no debug
#	1 - critical information
#	2 - error information
#	3 - warnings
#	4 - for debugging (produces lots of information)
#
# Mandatory: no
# Range: 0-4
# Default:
# DebugLevel=3

### Option: SourceIP
#	Source IP address for outgoing connections.
#
# Mandatory: no
# Default:
# SourceIP=

### Option: EnableRemoteCommands
#	Whether remote commands from Zabbix server are allowed.
#	0 - not allowed
#	1 - allowed
#
# Mandatory: no
# Default:
# EnableRemoteCommands=0

### Option: LogRemoteCommands
#	Enable logging of executed shell commands as warnings
#	0 - disabled
#	1 - enabled
#
# Mandatory: no
# Default:
# LogRemoteCommands=0

##### Passive checks related

### Option: Server
#	List of comma delimited IP addresses (or hostnames) of Zabbix servers.
#	No spaces allowed. First entry is used for receiving list of and sending active checks.
#	Note that hostnames must resolve hostname->IP address and IP address->hostname.
#	If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally.
#
# Mandatory: yes
# Default:
# Server=

Server=

### Option: Hostname
#	Unique, case sensitive hostname.
#	Required for active checks and must match hostname as configured on the server.
#
# Default:
# Hostname=system.uname

Hostname=

### Option: ListenPort
#	Agent will listen on this port for connections from the server.
#
# Mandatory: no
# Range: 1024-32767
# Default:
# ListenPort=10050

### Option: ListenIP
#	List of comma delimited IP addresses that the agent should listen on.
#
# Mandatory: no
# Default:
# ListenIP=0.0.0.0

# ListenIP=127.0.0.1

### Option: DisablePassive
#	Disable passive checks. The agent will not listen on any TCP port.
#	Only active checks will be processed.
#	0 - do not disable
#	1 - disable
#
# Mandatory: no
# Default:
# DisablePassive=0

##### Active checks related

### Option: DisableActive
#	Disable active checks. The agent will work in passive mode listening for server.
#
# Mandatory: no
# Default:
# DisableActive=0

# DisableActive=1

### Option: ServerPort
#	Server port for retrieving list of and  sending active checks.
#
# Mandatory: no
# Default:
# ServerPort=10051

### Option: RefreshActiveChecks
#	How often list of active checks is refreshed, in seconds.
#
# Mandatory: no
# Range: 60-3600
# Default:
# RefreshActiveChecks=120

### Option: BufferSend
#	Do not keep data longer than N seconds in buffer.
#
# Mandatory: no
# Range: 1-3600
# Default:
# BufferSend=5

### Option: BufferSize
#	Maximum number of values in a memory buffer. The agent will send
#	all collected data to Zabbix Server or Proxy if the buffer is full.
#
# Mandatory: no
# Range: 2-65535
# Default:
# BufferSize=100

### Option: MaxLinesPerSecond
#	Maximum number of new lines the agent will send per second to Zabbix Server
#	or Proxy processing 'log' and 'logrt' active checks.
#	The provided value will be overridden by the parameter 'maxlines',
#	provided in 'log' or 'logrt' item keys.
#
# Mandatory: no
# Range: 1-1000
# Default:
# MaxLinesPerSecond=100


############ ADVANCED PARAMETERS #################

### Option: StartAgents
#	Number of pre-forked instances of zabbix_agentd that process passive checks.
#
# Mandatory: no
# Range: 1-16
# Default:
# StartAgents=3

### Option: Timeout
#	Spend no more than Timeout seconds on processing
#
# Mandatory: no
# Range: 1-30
# Default:
# Timeout=3

### Option: Include
#	You may include individual files or all files in a directory in the configuration file.
#
# Mandatory: no
# Default:
# Include=

# Include=/etc/zabbix/zabbix_agent.userparams.conf
# Include=/etc/zabbix/zabbix_agentd/


####### USER-DEFINED MONITORED PARAMETERS #######

### Option: UnsafeUserParameters
#	Allow all characters to be passed in arguments to user-defined parameters.
#	0 - do not allow
#	1 - allow
#
# Mandatory: no
# Range: 0-1
# Default:
# UnsafeUserParameters=0

### Option: UserParameter
#	User-defined parameter to monitor. There can be several user-defined parameters.
#	Format: UserParameter=<key>,<shell command>
#	Note that shell command must not return empty string or EOL only.
#	Example: UserParameter=system.test,who|wc -l
#UserParameter=system.test,who|wc -l
### Set of parameters 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
diff --git a/testing/zabbix/zabbix_proxy.conf b/testing/zabbix/zabbix_proxy.conf
deleted file mode 100644
index 899fac2..0000000
--- a/testing/zabbix/zabbix_proxy.conf
@@ -1,175 +0,0 @@
# This is config file for ZABBIX server process
# To get more information about ZABBIX, 
# go http://www.zabbix.com

############ GENERAL PARAMETERS #################

# IP address (or hostname) of ZABBIX servers. 

Server=127.0.0.1

# Server port for sending active checks

ServerPort=10051

# Unique hostname.

Hostname=proxy

# Number of pre-forked instances of pollers
# Default value is 5
# This parameter must be between 0 and 255
#StartPollers=5

# Number of pre-forked instances of IPMI pollers
# Default value is 0
# This parameter must be between 0 and 255
#StartIPMIPollers=0

# Number of pre-forked instances of pollers for unreachable hosts
# Default value is 1
# This parameter must be between 0 and 255
#StartPollersUnreachable=1

# Number of pre-forked instances of trappers
# Default value is 5
# This parameter must be between 0 and 255
#StartTrappers=5

# Number of pre-forked instances of ICMP pingers
# Default value is 1
# This parameter must be between 0 and 255
#StartPingers=1

# Number of pre-forked instances of discoverers
# Default value is 1
# This parameter must be between 0 and 255
#StartDiscoverers=1

# Number of pre-forked instances of HTTP pollers
# Default value is 1
# This parameter must be between 0 and 255
#StartHTTPPollers=1

# Listen port for trapper. Default port number is 10051. This parameter 
# must be between 1024 and 32767
#ListenPort=10051

# Source IP address for outgouing connections
#SourceIP=

# Listen interface for trapper. Trapper will listen all network interfaces
# if this parameter is missing.
#ListenIP=127.0.0.1

# How often ZABBIX will perform sending hearbeat message
# (in seconds)
# Default value is 60 seconds
# Set to 0 to disable heartbeat messages
# This parameter must be between 0 and 3600
#HeartbeatFrequency=60

# How often ZABBIX will perform sync configuration data
# (in seconds)
# Default value is 3600 seconds (1h)
# This parameter must be between 1 and 604800 (1 week)
#ConfigFrequency=3600

# How often ZABBIX will perform housekeeping procedure
# (in hours)
# Default value is 1 hour
# Housekeeping is removing unnecessary information from
# tables history, alert, and alarms
# This parameter must be between 1 and 24
#HousekeepingFrequency=1

# How often ZABBIX will try to send unsent alerts
# (in seconds)
# Default value is 30 seconds
#SenderFrequency=30

# Local bufer size in hours. Proxy will keep collected data N hours.
# Default value is 0 hours
#ProxyLocalBuffer=0

# Offline buffer size in hours. It is used when server is not available.
# Older data is removed.
# Default value is 1 hours
#ProxyOfflineBuffer=1

# Specifies debug level
# 0 - debug is not created
# 1 - critical information
# 2 - error information
# 3 - warnings (default)
# 4 - for debugging (produces lots of information)
#DebugLevel=3

# Specifies how long we wait for agent response (in sec)
# Must be between 1 and 30 
Timeout=5

# Specifies how many seconds trapper may spend processing new data
# Must be between 1 and 30 
#TrapperTimeout=5

# After how many seconds of unreachability treat a host as unavailable
#UnreachablePeriod=45

# How ofter check host for availability during the unreachability period
#UnavailableDelay=15

# How ofter check host for availability during the unavailability period
#UnavailableDelay=60

# Name of PID file
PidFile=/var/run/zabbix/zabbix_proxy.pid

# Name of log file
# If not set, syslog is used
LogFile=/var/log/zabbix/zabbix_proxy.log

# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
LogFileSize=1

# Location for custom alert scripts
AlertScriptsPath=/home/zabbix/bin/

# Location of external scripts
#ExternalScripts=/etc/zabbix/externalscripts

# 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

# Temporary directory. Default is /tmp
#TmpDir=/tmp

# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds.
#PingerFrequency=60

# Database host name
# Default is localhost

#DBHost=localhost

# Database name
# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored.
DBName=proxy

# Database user

DBUser=root

# Database password
# Comment this line if no password used

#DBPassword=<password>

# Connect to MySQL using Unix socket?

#DBSocket=/tmp/mysql.sock
diff --git a/testing/zabbix/zabbix_server.conf b/testing/zabbix/zabbix_server.conf
deleted file mode 100644
index 39c12ef..0000000
--- a/testing/zabbix/zabbix_server.conf
@@ -1,155 +0,0 @@
# This is config file for ZABBIX server process
# To get more information about ZABBIX, 
# go http://www.zabbix.com

############ GENERAL PARAMETERS #################

# This defines unique NodeID in distributed setup,
# Default value 0 (standalone server)
# This parameter must be between 0 and 999
#NodeID=0

# Number of pre-forked instances of pollers
# Default value is 5
# This parameter must be between 0 and 255
#StartPollers=5

# Number of pre-forked instances of IPMI pollers
# Default value is 0
# This parameter must be between 0 and 255
#StartIPMIPollers=0

# Number of pre-forked instances of pollers for unreachable hosts
# Default value is 1
# This parameter must be between 0 and 255
#StartPollersUnreachable=1

# Number of pre-forked instances of trappers
# Default value is 5
# This parameter must be between 0 and 255
#StartTrappers=5

# Number of pre-forked instances of ICMP pingers
# Default value is 1
# This parameter must be between 0 and 255
#StartPingers=1

# Number of pre-forked instances of discoverers
# Default value is 1
# This parameter must be between 0 and 255
#StartDiscoverers=1

# Number of pre-forked instances of HTTP pollers
# Default value is 1
# This parameter must be between 0 and 255
#StartHTTPPollers=1

# Listen port for trapper. Default port number is 10051. This parameter 
# must be between 1024 and 32767

#ListenPort=10051

# Source IP address for outgouing connections
#SourceIP=

# Listen interface for trapper. Trapper will listen all network interfaces
# if this parameter is missing.

#ListenIP=127.0.0.1

# How often ZABBIX will perform housekeeping procedure
# (in hours)
# Default value is 1 hour
# Housekeeping is removing unnecessary information from
# tables history, alert, and alarms
# This parameter must be between 1 and 24

#HousekeepingFrequency=1

# How often ZABBIX will try to send unsent alerts
# (in seconds)
# Default value is 30 seconds
SenderFrequency=30

# Uncomment this line to disable housekeeping procedure
#DisableHousekeeping=1

# Specifies debug level
# 0 - debug is not created
# 1 - critical information
# 2 - error information
# 3 - warnings (default)
# 4 - for debugging (produces lots of information)

DebugLevel=3

# Specifies how long we wait for agent response (in sec)
# Must be between 1 and 30 
Timeout=5

# Specifies how many seconds trapper may spend processing new data
# Must be between 1 and 30 
#TrapperTimeout=5

# After how many seconds of unreachability treat a host as unavailable
#UnreachablePeriod=45

# How ofter check host for availability during the unreachability period
#UnavailableDelay=15

# How ofter check host for availability during the unavailability period
#UnavailableDelay=60

# Name of PID file

PidFile=/var/run/zabbix/zabbix_server.pid

# Name of log file
# If not set, syslog is used

LogFile=/var/log/zabbix/zabbix_server.log

# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
LogFileSize=2

# Location for custom alert scripts
AlertScriptsPath=/home/zabbix/bin/

# Location of external scripts
#ExternalScripts=/etc/zabbix/externalscripts

# 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

# Temporary directory. Default is /tmp
#TmpDir=/tmp

# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds.
#PingerFrequency=60

# Database host name
# Default is localhost

#DBHost=localhost

# Database name
# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored.
DBName=zabbix

# Database user

DBUser=root

# Database password
# Comment this line if no password used

#DBPassword=<password>

# Connect to MySQL using Unix socket?

#DBSocket=/tmp/mysql.sock
diff --git a/testing/zabbix/zabbix_trapper.conf b/testing/zabbix/zabbix_trapper.conf
deleted file mode 100644
index 7f235f6..0000000
--- a/testing/zabbix/zabbix_trapper.conf
@@ -1,44 +0,0 @@
# This is config file for zabbix_trapper
# To get more information about ZABBIX, 
# go http://www.zabbix.com

############ GENERAL PARAMETERS #################

# Specifies debug level
# 1 - critical information
# 2 - warnings (default)
# 3 - for debugging (produces lots of information)

DebugLevel=2

# Spend no more than Timeout seconds on processing
# Must be between 1 and 30

Timeout=3

# Name of log file
# If not set, syslog will be used

LogFile=/var/log/zabbix/zabbix_trapper.log

# Database host name
# Default is localhost

DBHost=localhost

# Database name

DBName=zabbix

# Database user

DBUser=zabbix

# Database password
# Comment this line if no password used

DBPassword=zabbix

# Connect to MySQL usig Unix socket?

#DBSocket=/tmp/mysql.sock
-- 
1.7.3.2



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa <ncopa@alpinelinux.org>
Details
Message ID
<1291650600.7439.3.camel@ncopa-desktop.nor.wtbts.net>
In-Reply-To
<1291620160-21784-1-git-send-email-duanejevon@gmail.com> (view parent)
Sender timestamp
1291650600
DKIM signature
missing
Download raw message
On Mon, 2010-12-06 at 07:22 +0000, Duane Hughes wrote:
> fixes #251

applied. thanks!

-nc




---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)