From e0ead87c9312eca57ba297830d5e405308cf8afb Mon Sep 17 00:00:00 2001 From: Matthias Drobny Date: Wed, 15 Oct 2014 15:56:52 +0200 Subject: [PATCH 1/8] Unitas Network GmbH supported version of Zabbix (only customers) --- net-analyzer/zabbix/ChangeLog | 968 ++++++++++++++++++++++++ net-analyzer/zabbix/Manifest | 4 + net-analyzer/zabbix/metadata.xml | 27 + net-analyzer/zabbix/zabbix-2.4.1.ebuild | 365 +++++++++ 4 files changed, 1364 insertions(+) create mode 100644 net-analyzer/zabbix/ChangeLog create mode 100644 net-analyzer/zabbix/Manifest create mode 100644 net-analyzer/zabbix/metadata.xml create mode 100644 net-analyzer/zabbix/zabbix-2.4.1.ebuild diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog new file mode 100644 index 0000000..76cb14e --- /dev/null +++ b/net-analyzer/zabbix/ChangeLog @@ -0,0 +1,968 @@ +# ChangeLog for net-analyzer/zabbix +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.168 2014/10/12 08:56:52 ago Exp $ + + 12 Oct 2014; Agostino Sarubbo zabbix-2.2.5.ebuild: + Stable for x86, wrt bug #516840 + + 10 Oct 2014; Agostino Sarubbo zabbix-2.2.5.ebuild: + Stable for amd64, wrt bug #516840 + + 10 Aug 2014; Sergei Trofimovich zabbix-2.0.12-r1.ebuild, + zabbix-2.0.12.ebuild, zabbix-2.2.4.ebuild, zabbix-2.2.5.ebuild: + QA: drop trailing '.' from DESCRIPTION + +*zabbix-2.2.5 (23 Jul 2014) + + 23 Jul 2014; Matthew Marlowe +zabbix-2.2.5.ebuild: + Bump Zabbix Version 2.2.5 + + 08 Jul 2014; Pacho Ramos files/zabbix-agentd.service: + Fix zabbix-agentd.service (#515618 by Christian Roessner) + +*zabbix-2.0.12-r1 (25 Jun 2014) +*zabbix-2.2.4 (25 Jun 2014) + + 25 Jun 2014; Matthew Marlowe + +files/2.2/patches/zbx8151.patch, +zabbix-2.0.12-r1.ebuild, + +zabbix-2.2.4.ebuild, -zabbix-2.0.11_rc1-r1.ebuild, -zabbix-2.2.3.ebuild: + Upstream version bump with patch for Security bug 513814, Cleanup for prior + security bug 509898 + + 08 Jun 2014; Agostino Sarubbo zabbix-2.0.12.ebuild: + Stable for x86, wrt bug #509898 + + 08 Jun 2014; Agostino Sarubbo zabbix-2.0.12.ebuild: + Stable for amd64, wrt bug #509898 + +*zabbix-2.0.12 (14 May 2014) +*zabbix-2.2.3 (14 May 2014) + + 14 May 2014; Matthew Marlowe +zabbix-2.0.12.ebuild, + +zabbix-2.2.3.ebuild, -zabbix-2.2.2-r1.ebuild: + Bump for 2.0.12 and 2.2.3 + +*zabbix-2.2.2-r1 (13 Apr 2014) + + 13 Apr 2014; Pacho Ramos +zabbix-2.2.2-r1.ebuild, + -zabbix-2.2.2.ebuild: + Don't use USE flag to control file installation (#502224) + +*zabbix-2.2.2 (24 Feb 2014) + + 24 Feb 2014; Matthew Marlowe +zabbix-2.2.2.ebuild, + -zabbix-2.2.2_rc2-r3.ebuild, metadata.xml: + 2.2.2 Version Bump, Add systemd iuse flag + +*zabbix-2.2.2_rc2-r3 (23 Feb 2014) + + 23 Feb 2014; Matthew Marlowe +zabbix-2.2.2_rc2-r3.ebuild, + -zabbix-2.0.9-r1.ebuild, -zabbix-2.2.0-r4.ebuild, -zabbix-2.2.0-r5.ebuild, + -zabbix-2.2.2_rc2-r1.ebuild, -zabbix-2.2.2_rc2-r2.ebuild: + Wrap systemd file install with if use systemd; + + 16 Feb 2014; Agostino Sarubbo zabbix-2.0.11_rc1-r1.ebuild: + Stable for x86, wrt bug #500342 + + 16 Feb 2014; Agostino Sarubbo zabbix-2.0.11_rc1-r1.ebuild: + Stable for amd64, wrt bug #500342 + +*zabbix-2.2.2_rc2-r2 (15 Feb 2014) +*zabbix-2.2.0-r5 (15 Feb 2014) + + 15 Feb 2014; Pacho Ramos +files/zabbix-agentd.service, + +files/zabbix-agentd.tmpfiles, +files/zabbix-proxy.service, + +files/zabbix-proxy.tmpfiles, +files/zabbix-server.service, + +files/zabbix-server.tmpfiles, +zabbix-2.2.0-r5.ebuild, + +zabbix-2.2.2_rc2-r2.ebuild: + Add systemd unit files (#498090 by salikov.alexey) + +*zabbix-2.2.2_rc2-r1 (08 Feb 2014) +*zabbix-2.0.11_rc1-r1 (08 Feb 2014) + + 08 Feb 2014; Matthew Marlowe +zabbix-2.0.11_rc1-r1.ebuild, + +zabbix-2.2.2_rc2-r1.ebuild, -zabbix-2.0.11_rc1.ebuild, + -zabbix-2.2.2_rc2.ebuild: + Latest upstream bumps include fix for zabbix bug 7479, removing it from gentoo + manual patches. + +*zabbix-2.0.11_rc1 (07 Feb 2014) +*zabbix-2.2.2_rc2 (07 Feb 2014) + + 07 Feb 2014; Matthew Marlowe +zabbix-2.0.11_rc1.ebuild, + +zabbix-2.2.2_rc2.ebuild: + Security Version Bumps for Zabbix 2.0.11rc1 and 2.2.2rc2 + + 17 Dec 2013; Matthew Marlowe -zabbix-2.0.9.ebuild, + -zabbix-2.0.9_rc1-r2.ebuild, -zabbix-2.0.9_rc1-r3.ebuild, + zabbix-2.2.0-r4.ebuild: + Remove all ebuilds known to have security vulnernabilities. Removed Zabbix + 2.2.0 from package mask, no bugs entered for it over last several weeks, ready + to enter testing tree - marked ~amd64/~x86. Current stable is 2.0.9-r1, which + upstream made some other additional changes to and released as 2.0.10. + + 10 Dec 2013; Agostino Sarubbo zabbix-2.0.9-r1.ebuild: + Stable for x86, wrt bug #493250 + + 10 Dec 2013; Agostino Sarubbo zabbix-2.0.9-r1.ebuild: + Stable for amd64, wrt bug #493250 + +*zabbix-2.0.9-r1 (03 Dec 2013) +*zabbix-2.2.0-r4 (03 Dec 2013) + + 03 Dec 2013; Matthew Marlowe + +files/2.0/patches/zbx7479.patch, +files/2.2/patches/zbx7479.patch, + +zabbix-2.0.9-r1.ebuild, +zabbix-2.2.0-r4.ebuild, -zabbix-2.2.0-r3.ebuild: + Patching for Zabbix Vulnerability - Possible Shell Code Injection - + https://support.zabbix.com/browse/ZBX-7479 + + 27 Nov 2013; Matthew Marlowe zabbix-2.0.9.ebuild: + Zabbix 2.0.9 keyworded ~amd64 and ~x86 + +*zabbix-2.0.9 (24 Nov 2013) + + 24 Nov 2013; Matthew Marlowe +zabbix-2.0.9.ebuild: + Version Bump + +*zabbix-2.2.0-r3 (16 Nov 2013) + + 16 Nov 2013; Matthew Marlowe +zabbix-2.2.0-r3.ebuild, + -zabbix-2.2.0-r2.ebuild: + Additional fixes for src_install in test zabbix 2.2.0 major bump ebuild. + +*zabbix-2.2.0-r2 (16 Nov 2013) + + 16 Nov 2013; Matthew Marlowe +zabbix-2.2.0-r2.ebuild, + -zabbix-2.2.0-r1.ebuild: + Minor bugfixes for src_install doins/doinitd + +*zabbix-2.2.0-r1 (16 Nov 2013) + + 16 Nov 2013; Matthew Marlowe + +files/2.2/init.d/zabbix-agentd, +files/2.2/init.d/zabbix-proxy, + +files/2.2/init.d/zabbix-server, +files/2.2/zabbix_agent.conf, + +files/2.2/zabbix_agentd.conf, +files/2.2/zabbix_proxy.conf, + +files/2.2/zabbix_server.conf, +zabbix-2.2.0-r1.ebuild, -zabbix-2.2.0.ebuild, + metadata.xml: + Updated config and init files for zabbix 2.2, Revised use flags/configure + function, Other minor updates + + 16 Nov 2013; Matthew Marlowe zabbix-2.2.0.ebuild: + Zabbix-2.2.0 no longer happy with old zbx282 patch. + +*zabbix-2.2.0 (15 Nov 2013) + + 15 Nov 2013; Matthew Marlowe +zabbix-2.2.0.ebuild: + Major version bump zabbix 2.2.0, Minor ebuild cleanups, no keywords until + testing complete + + 14 Oct 2013; Matthew Marlowe -zabbix-2.0.8.ebuild: + Removing older ebuilds affected by 486696. + + 13 Oct 2013; Agostino Sarubbo zabbix-2.0.9_rc1-r2.ebuild: + Stable for x86, wrt bug #486696 + + 05 Oct 2013; Agostino Sarubbo zabbix-2.0.9_rc1-r2.ebuild: + Stable for amd64, wrt bug #486696 + + 05 Oct 2013; Rick Farina zabbix-2.0.8.ebuild, + zabbix-2.0.9_rc1-r2.ebuild, zabbix-2.0.9_rc1-r3.ebuild: + silence QA warning by removing epause and ebeep (not defined in EAPI5) + + 05 Oct 2013; Rick Farina zabbix-2.0.8.ebuild, + zabbix-2.0.9_rc1-r2.ebuild, zabbix-2.0.9_rc1-r3.ebuild: + trivial fix for bug #433708 to remove unneeded Makefiles + +*zabbix-2.0.9_rc1-r3 (04 Oct 2013) + + 04 Oct 2013; Matthew Marlowe +zabbix-2.0.9_rc1-r3.ebuild: + Fix for bug 486950 + +*zabbix-2.0.9_rc1-r2 (03 Oct 2013) + + 03 Oct 2013; Matthew Marlowe +zabbix-2.0.9_rc1-r2.ebuild, + -zabbix-2.0.9_rc1-r1.ebuild: + Initial developer revisions for 2.0.9rc1-r2 bump complete, releasing to user + testing arch, with expected fast stabilization due to bug 486696 + +*zabbix-2.0.9_rc1-r1 (02 Oct 2013) + + 02 Oct 2013; Matthew Marlowe +zabbix-2.0.9_rc1-r1.ebuild, + -zabbix-2.0.9_rc1.ebuild: + Added MY_PV bash variable to deal with _rc1 version numbers impacting naming + of java jar files. + +*zabbix-2.0.9_rc1 (02 Oct 2013) + + 02 Oct 2013; Matthew Marlowe +zabbix-2.0.9_rc1.ebuild: + Bump for security vulnerability, Bug 486696 and ZBX-7091, + https://bugs.gentoo.org/show_bug.cgi?id=486696 Temporarily no keywords on + package while testing. + + 22 Sep 2013; Matthew Marlowe -zabbix-2.0.4-r1.ebuild, + -zabbix-2.0.5.ebuild, -zabbix-2.0.6-r5.ebuild: + No longer supporting zabbix releases prior to 2.0.8 due to php and curl + compatibility bugs plus other important fixes, 2.0.4 (the old stable) in + particular is far out of date with recent ebuild changes, zabbix 2.0.8 is new + stable and recommended zabbix version for deployment. + + 22 Sep 2013; Agostino Sarubbo zabbix-2.0.8.ebuild: + Stable for x86, wrt bug #484822 + + 15 Sep 2013; Agostino Sarubbo zabbix-2.0.8.ebuild: + Stable for amd64, wrt bug #484822 + +*zabbix-2.0.8 (05 Sep 2013) + + 05 Sep 2013; Matthew Marlowe +zabbix-2.0.8.ebuild: + Bump for Zabbix-2.0.8, Thanks to Alice Ferrazzi alice.ferrazzi@gmail.com and + Rodrigo Severo rodrigo@fabricadeideias.com - Closes bug 482810. + + 19 Jul 2013; Matthew Marlowe files/2.0/init.d/zabbix-proxy: + Minor tweak for bug 460562 - zabbix_proxy init file. + + 24 Jun 2013; Matthew Marlowe zabbix-2.0.6-r5.ebuild: + Removing package mask for 2.0.6-r5, it has successfully completed initial + testing. + +*zabbix-2.0.6-r5 (23 Jun 2013) + + 23 Jun 2013; Matthew Marlowe +zabbix-2.0.6-r5.ebuild, + -zabbix-2.0.6-r1.ebuild, -zabbix-2.0.6-r2.ebuild, -zabbix-2.0.6-r3.ebuild, + -zabbix-2.0.6-r4.ebuild, -zabbix-2.0.6.ebuild: + Fix for bug #450742 - Newer versions of curl are incompatible with zabbix + 2.0.x until upstream makes fixes (been waiting 3+ months for fix). + +*zabbix-2.0.6-r4 (22 Jun 2013) + + 22 Jun 2013; Matthew Marlowe +zabbix-2.0.6-r4.ebuild: + Fix for bug #456850 - Allow non-standard AR/RANLIB if user specified. + +*zabbix-2.0.6-r3 (06 May 2013) + + 06 May 2013; Matthew Marlowe +files/2.0/zabbix_proxy.conf, + +zabbix-2.0.6-r3.ebuild: + Bug fix #460566 + +*zabbix-2.0.6-r2 (06 May 2013) + + 06 May 2013; Matthew Marlowe + +files/2.0/init.d/zabbix-proxy, +zabbix-2.0.6-r2.ebuild: + Fix for bug #460562 + + 06 May 2013; Matthew Marlowe -zabbix-1.8.16.ebuild: + Per QA Bug #445944, remove zabbix 1.8.x ebuilds from tree. + +*zabbix-2.0.6-r1 (06 May 2013) + + 06 May 2013; Matthew Marlowe + +files/2.0/patches/zbx282.patch, +zabbix-2.0.6-r1.ebuild: + Fix for bug #465376 which addresses zabbix upstream bug #282 - "lm_sensors + compatibility with recent linux kernels". + +*zabbix-2.0.6 (27 Apr 2013) + + 27 Apr 2013; Matthew Marlowe +zabbix-2.0.6.ebuild: + First draft of bump for Zabbix 2.0.6 + + 22 Feb 2013; Matthew Marlowe zabbix-2.0.5.ebuild: + Fix Bug #457674 in zabbix 2.0.5, unnecessary application of zabbix 6074 patch. + + 16 Feb 2013; Matthew Marlowe zabbix-2.0.5.ebuild: + Remove testing keywords on zabbix-2.0.5 while troubleshooting issue with a + patch. + +*zabbix-2.0.5 (13 Feb 2013) + + 13 Feb 2013; Matthew Marlowe +zabbix-2.0.5.ebuild, + -zabbix-1.8.15.ebuild, -zabbix-2.0.3.ebuild: + Bump for Zabbix 2.0.5, keyworded ~amd64/~x86 for testing + + 11 Feb 2013; Agostino Sarubbo zabbix-2.0.4-r1.ebuild: + Stable for x86, wrt bug #452878 + + 11 Feb 2013; Agostino Sarubbo zabbix-2.0.4-r1.ebuild: + Stable for amd64, wrt bug #452878 + + 18 Jan 2013; Matthew Marlowe + files/2.0/init.d/zabbix-agentd, files/2.0/init.d/zabbix-server, + zabbix-2.0.4-r1.ebuild: + Keyword change for 2.0.4-r1, ready for testing arches. Also, minor fix for + 2.0 init files. + +*zabbix-2.0.4-r1 (18 Jan 2013) +*zabbix-1.8.16 (18 Jan 2013) + + 18 Jan 2013; Matthew Marlowe + +files/2.0/patches/zbx6097.patch, +zabbix-1.8.16.ebuild, + +zabbix-2.0.4-r1.ebuild, -zabbix-2.0.2-r1.ebuild, -zabbix-2.0.2-r2.ebuild, + -zabbix-2.0.4.ebuild: + Fix for CVE-2013-1364, and upstream bug #ZBX-6097. Bumps 1.8.16 and 2.0.4-r1. + +*zabbix-2.0.4 (27 Dec 2012) + + 27 Dec 2012; Matthew Marlowe +zabbix-2.0.4.ebuild, + files/2.0/init.d/zabbix-agentd, files/2.0/init.d/zabbix-server: + Bump for Zabbix 2.0.4 Testing minor ebuild and init script changes, in + particular with regard to new /var/run/subdirectory creation/handling. If + testing goes well, 2.0.4 will eventually become the new stable after being + keyworded ~amd64/~x86. It currently has no keywords. Current users of 1.8.x + should consider 2.0.4 a future migration target. + +*zabbix-2.0.3 (05 Oct 2012) + + 05 Oct 2012; Matthew Marlowe +zabbix-2.0.3.ebuild: + Bump for Zabbix 2.0.3 + +*zabbix-2.0.2-r2 (02 Oct 2012) + + 02 Oct 2012; Matthew Marlowe +zabbix-2.0.2-r2.ebuild: + Fixes for bug 435016, bug 433090, and bug 412247. + + 30 Aug 2012; Agostino Sarubbo zabbix-1.8.15.ebuild: + Stable for amd64, wrt bug #428372 + + 30 Aug 2012; Pawel Hajdan jr zabbix-1.8.15.ebuild: + x86 stable wrt bug #428372 + +*zabbix-1.8.15 (21 Aug 2012) + + 21 Aug 2012; Matthew Marlowe +zabbix-1.8.15.ebuild, + -zabbix-1.8.11-r2.ebuild, -zabbix-1.8.14.ebuild, -zabbix-2.0.2.ebuild: + Bump for Zabbix 1.8.15 Removed releases with recent security vulnerabilities. + Note -- 1.8.15 will become the new stable after I have time to do more testing + with it. 1.8.15 will be the last stable of the 1.8.x train which a 2.0.x + stable will not immediately supersede. 2.0.x releases are currently at + 2.0.2..we'll probably move 2.0.3 or 2.0.4 out of testing arches to stable if + the amount of bug fixing churn slows down significantly. + +*zabbix-2.0.2-r1 (01 Aug 2012) + + 01 Aug 2012; Matthew Marlowe +zabbix-2.0.2-r1.ebuild, + files/2.0/init.d/zabbix-agentd, files/2.0/init.d/zabbix-server: + Fixes for bug 426818 and bug 427740. Modified init scripts to create + /var/run/zabbix if needed and added 'sysvipc' to php dependency use flags. + +*zabbix-2.0.2 (01 Aug 2012) + + 01 Aug 2012; Matthew Marlowe +zabbix-2.0.2.ebuild, + -zabbix-2.0.1.ebuild: + Initial bump for 2.0.2, Fixes Security Bug - Removed prior 2.0.x releases. + Will fix other lingering 2.0.x issues with -r1 release soon. + +*zabbix-2.0.1 (02 Jul 2012) + + 02 Jul 2012; Matthew Marlowe -zabbix-1.8.13-r1.ebuild, + -zabbix-2.0.0-r1.ebuild, -zabbix-2.0.1_rc2.ebuild, +zabbix-2.0.1.ebuild: + Bump for Zabbix 2.0.1 - Zabbix 2.0 releases are no longer package masked, + moved to ~amd64 and ~x86. + +*zabbix-1.8.14 (29 Jun 2012) + + 29 Jun 2012; Matthew Marlowe +zabbix-1.8.14.ebuild: + Bump for Zabbix 1.8.14 which seems to be just bug fixes for legacy 1.8.x tree + + 20 Jun 2012; Matthew Marlowe -zabbix-1.8.10-r1.ebuild, + -zabbix-1.8.10-r2.ebuild, -zabbix-1.8.11.ebuild, -zabbix-1.8.11-r1.ebuild, + -zabbix-1.8.12.ebuild: + Remove obsolete ebuilds - 1.8.11r2 is current stable, 1.8.13-r1 is future + stable, 1.8.14 will enter testing when released, and latest 2.0.1 will be the + first 2.0.x ebuild to be unmasked for testing on ~amd and ~x86 in the next + week. + +*zabbix-2.0.1_rc2 (20 Jun 2012) + + 20 Jun 2012; Matthew Marlowe + files/1.6.6/zabbix_proxy.conf, files/1.6.6/zabbix_server.conf, + files/1.6.6/zabbix_trapper.conf, +zabbix-2.0.1_rc2.ebuild: + Bump for Zabbix 2.0.1_rc2 which is currently masked. If no major bugs + reported, will release into testing arches soon making the 2.0.x releases + ~arch while keeping 1.8.x releases in stable. Also, minor mysql socket file + path update in default config files to fix bug #377241 which has been waiting + patiently for closure. + + 12 Jun 2012; Zac Medico zabbix-1.8.10-r1.ebuild, + zabbix-1.8.10-r2.ebuild, zabbix-1.8.11-r1.ebuild, zabbix-1.8.11-r2.ebuild, + zabbix-1.8.11.ebuild, zabbix-1.8.12.ebuild, zabbix-1.8.13-r1.ebuild, + zabbix-2.0.0-r1.ebuild, zabbix-2.0.0.ebuild: + inherit user for egethome, enewgroup, and enewuser + +*zabbix-2.0.0-r1 (05 Jun 2012) + + 05 Jun 2012; Matthew Marlowe +zabbix-2.0.0-r1.ebuild: + Added nls use flag to php frontend dependency and ensured the db upgrade + patches from 1.8.x are installed in /usr/share/zabbix/upgrades. Fix bug + #417931 and #417933. + +*zabbix-2.0.0 (22 May 2012) + + 22 May 2012; Matthew Marlowe + files/2.0/init.d/zabbix-agentd, -zabbix-2.0.0_rc6.ebuild, + -zabbix-2.0.0_rc6-r1.ebuild, +zabbix-2.0.0.ebuild, + +files/2.0/init.d/zabbix-server: + Bump for zabbix 2.0 plus minor init script and elog msg updates + + 21 May 2012; Pawel Hajdan jr zabbix-1.8.11-r2.ebuild: + x86 stable wrt bug #414551 + +*zabbix-2.0.0_rc6-r1 (21 May 2012) + + 21 May 2012; Matthew Marlowe +zabbix-2.0.0_rc6-r1.ebuild: + Update dependencies for Zabbix 2.0rc6 per Installation Guide Requirements + Document at + http://www.zabbix.com/documentation/2.0/manual/installation/requirements + +*zabbix-2.0.0_rc6 (19 May 2012) + + 19 May 2012; Matthew Marlowe -zabbix-2.0.0_rc5.ebuild, + +zabbix-2.0.0_rc6.ebuild: + 2.0.0rc6 Version Bump + + 18 May 2012; Matthew Marlowe + -files/1.6.6/init.d/zabbix-agentd-r1, -zabbix-1.8.13.ebuild, + -zabbix-2.0.0_rc4.ebuild, +zabbix-2.0.0_rc5.ebuild, + +files/2.0/init.d/zabbix-agentd: + remove testing ebuilds that reference files/1.6.6/init.d/zabbix-agentd-r1. + That file has been moved to 2.0/init.d/zabbix-agentd and will be referenced + in new ebuilds. + + 18 May 2012; Matthew Marlowe + +files/2.0/init.d/zabbix-agentd, -files/1.6.6/init.d/zabbix-agentd-r1, + -zabbix-2.0.0_rc4.ebuild, +zabbix-2.0.0_rc5.ebuild: + removed default on setting for sqlite use flag, added warning about rc5 db + upgrade, revised agentd init file + +*zabbix-2.0.0_rc5 (18 May 2012) + + 18 May 2012; Matthew Marlowe -zabbix-2.0.0_rc4.ebuild, + +zabbix-2.0.0_rc5.ebuild: + 2.0rc5 version bump + +*zabbix-1.8.13-r1 (15 May 2012) + + 15 May 2012; Matthew Marlowe -zabbix-1.8.12-r1.ebuild, + +zabbix-1.8.13-r1.ebuild: + Revert non-maintainer commit relating to agentd init script. Bug 415941. + +*zabbix-2.0.0_rc4 (12 May 2012) +*zabbix-1.8.13 (12 May 2012) + + 12 May 2012; Matthew Marlowe +zabbix-1.8.13.ebuild, + +zabbix-2.0.0_rc4.ebuild: + Bump for 1.8.13 and 2.0.0rc4 + +*zabbix-1.8.12-r1 (11 May 2012) + + 11 May 2012; Peter Volkov + +files/1.6.6/init.d/zabbix-agentd-r1, +zabbix-1.8.12-r1.ebuild: + Fix problem with agentd service startup in openvz/vserver environment: + processes inside containers are visible from host, and this precludes start + of agentd as start-stop-daemon conciders agentd running. + + 05 May 2012; Markos Chandras zabbix-1.8.11-r2.ebuild: + Stable on amd64 wrt bug #414551 + + 04 May 2012; Jeff Horelick zabbix-1.8.10-r1.ebuild, + zabbix-1.8.10-r2.ebuild, zabbix-1.8.11.ebuild, zabbix-1.8.11-r1.ebuild, + zabbix-1.8.11-r2.ebuild, zabbix-1.8.12.ebuild, zabbix-2.0.0_rc3.ebuild, + zabbix-2.0.0_rc3-r1.ebuild: + dev-util/pkgconfig -> virtual/pkgconfig + +*zabbix-2.0.0_rc3-r1 (27 Apr 2012) + + 27 Apr 2012; Matthew Marlowe +zabbix-2.0.0_rc3-r1.ebuild: + Number of small fixes for 2.0.0rc3 ebuild, put zabbix java stuff into + /opt/zabbix_java/ + +*zabbix-2.0.0_rc3 (24 Apr 2012) +*zabbix-1.8.12 (24 Apr 2012) + + 24 Apr 2012; Matthew Marlowe +zabbix-1.8.12.ebuild, + -zabbix-2.0.0_rc2.ebuild, +zabbix-2.0.0_rc3.ebuild: + Bumps for Zabbix 2.0rc3 and 1.8.12 + +*zabbix-1.8.11-r2 (19 Apr 2012) + + 19 Apr 2012; Matthew Marlowe +zabbix-1.8.11-r2.ebuild, + zabbix-2.0.0_rc2.ebuild: + Update zabbix dependencies, not compatible with fping >= 3.0, Tracking Bug + 412659 + + 16 Apr 2012; Matthew Marlowe zabbix-2.0.0_rc2.ebuild: + Zabbix 2.0 changed configure option for postgres from pgsql to postgresql. + Testing ebuild updated + + 16 Apr 2012; Matthew Marlowe +zabbix-2.0.0_rc2.ebuild, + metadata.xml: + Initial work towards resolving bug 412247 and bug 410183 + +*zabbix-2.0.0_rc2 (16 Apr 2012) + + 16 Apr 2012; Matthew Marlowe +zabbix-2.0.0_rc2.ebuild, + metadata.xml: + Testing initial support for Zabbix 2.0 release candidates + + 09 Apr 2012; Matthew Marlowe +zabbix-1.8.11-r1.ebuild, + metadata.xml: + Added support for static binary build and reviewed all use flags and + clarified descriptions in metadata + +*zabbix-1.8.11-r1 (09 Apr 2012) + + 09 Apr 2012; Matthew Marlowe +zabbix-1.8.11-r1.ebuild, + metadata.xml: + add support for odbc and iodbc use flags to enable zabbix database monitoring + with either unixodbc or iodbc libraries + + 21 Mar 2012; Matthew Marlowe + -files/zabbix-1.8.2-as-needed.patch, -files/zabbix-1.8.3-as-needed.patch, + zabbix-1.8.11.ebuild, -files/zabbix-as-needed.patch: + Removed legacy unused patches + + 21 Mar 2012; Matthew Marlowe zabbix-1.8.11.ebuild: + zabbix-1.8.11 ebuild working fine on dev boxes, pushing out to testing on + amd64 and x86 arches + + 21 Mar 2012; Matthew Marlowe zabbix-1.8.11.ebuild: + 1.8.11 seems to no longer require the as-needed patch as all the automake + changes in the patch appear to be implemented in the release + + 20 Mar 2012; Matthew Marlowe metadata.xml: + Received patricks ok to remove him from maintainer list in metadata + +*zabbix-1.8.11 (20 Mar 2012) + + 20 Mar 2012; Matthew Marlowe +zabbix-1.8.11.ebuild: + Bump zabbix 1.8.11 release, appears bug fix only, masking temporarily while I + confirm no patches broke with new release + +*zabbix-1.8.10-r2 (20 Mar 2012) + + 20 Mar 2012; Matthew Marlowe zabbix-1.8.10-r1.ebuild, + +zabbix-1.8.10-r2.ebuild, -zabbix-1.9.5-r1.ebuild: + Reverted non maintainer commit that might have broken only stable release, + moved changes to new r2 bump, applied user supplied patch to fix changes, + marked new bump testing, removed obsolete alpha release + + 19 Mar 2012; Pacho Ramos zabbix-1.8.10-r1.ebuild, + zabbix-1.9.5-r1.ebuild: + Move from sqlite3 USE flag to sqlite, bug #251394 (fixed with Patrick + permission). + + 21 Feb 2012; Matthew Marlowe -zabbix-1.8.7-r2.ebuild, + -zabbix-1.8.7-r3.ebuild, -zabbix-1.8.8-r2.ebuild, -zabbix-1.8.8-r3.ebuild, + -zabbix-1.8.9-r2.ebuild, -zabbix-1.8.9-r3.ebuild, -zabbix-1.9.4-r1.ebuild: + Removed older ebuilds impacted by various vulnerabilities + + 08 Jan 2012; Pawel Hajdan jr zabbix-1.8.10-r1.ebuild: + x86 stable wrt bug #396495 + + 04 Jan 2012; Agostino Sarubbo zabbix-1.8.10-r1.ebuild: + Stable for AMD64, wrt security bug #396495 + +*zabbix-1.9.5-r1 (31 Dec 2011) +*zabbix-1.9.4-r1 (31 Dec 2011) +*zabbix-1.8.10-r1 (31 Dec 2011) +*zabbix-1.8.9-r3 (31 Dec 2011) +*zabbix-1.8.9-r2 (31 Dec 2011) +*zabbix-1.8.8-r3 (31 Dec 2011) +*zabbix-1.8.8-r2 (31 Dec 2011) +*zabbix-1.8.7-r3 (31 Dec 2011) +*zabbix-1.8.7-r2 (31 Dec 2011) + + 31 Dec 2011; Christian Ruppert -zabbix-1.8.7.ebuild, + -zabbix-1.8.7-r1.ebuild, +zabbix-1.8.7-r2.ebuild, +zabbix-1.8.7-r3.ebuild, + -zabbix-1.8.8.ebuild, -zabbix-1.8.8-r1.ebuild, +zabbix-1.8.8-r2.ebuild, + +zabbix-1.8.8-r3.ebuild, -zabbix-1.8.9.ebuild, -zabbix-1.8.9-r1.ebuild, + +zabbix-1.8.9-r2.ebuild, +zabbix-1.8.9-r3.ebuild, -zabbix-1.8.10.ebuild, + +zabbix-1.8.10-r1.ebuild, -zabbix-1.9.4.ebuild, +zabbix-1.9.4-r1.ebuild, + -zabbix-1.9.5.ebuild, +zabbix-1.9.5-r1.ebuild, + files/1.4.6/init.d/zabbix-agentd, files/1.4.6/init.d/zabbix-server, + files/1.6.5/init.d/zabbix-agentd, files/1.6.5/init.d/zabbix-server, + files/1.6.6/init.d/zabbix-agentd, files/1.6.6/init.d/zabbix-proxy, + files/1.6.6/init.d/zabbix-server: + Revbump. Don't use deprecated start-stop-daemon options, bug 376865. + + 30 Dec 2011; Lars Wendler + files/1.6.6/init.d/zabbix-agentd, files/1.6.6/init.d/zabbix-proxy, + files/1.6.6/init.d/zabbix-server: + non-maintainer commit: Fixed init scripts to not use s-s-d's deprecated + -c/--chuid option anymore. Acked by bonsaikitten. + +*zabbix-1.8.10 (30 Dec 2011) + + 30 Dec 2011; Lars Wendler + -zabbix-1.8.10_rc1.ebuild, +zabbix-1.8.10.ebuild: + non-maintainer commit: Version bump (with kind permission from bonsaikitten). + Removed old. This fixes bug #395975 and should help solving bug #396495. + +*zabbix-1.8.10_rc1 (16 Dec 2011) + + 16 Dec 2011; Matthew Marlowe +zabbix-1.8.10_rc1.ebuild: + Bump production to 1.8.10rc1 which includes bug and security fixes - remove + very old releases from tree, some of which have known vulnerabilities + +*zabbix-1.8.9-r1 (29 Nov 2011) + + 29 Nov 2011; Matthew Marlowe zabbix-1.8.9.ebuild, + +zabbix-1.8.9-r1.ebuild, +files/zabbix-1.8.9-as-needed.patch: + Updated as needed patch for zabbix 1.8.9, deprecated r0 ebuild which uses old + patch, fix in 1.8.9-r1 + +*zabbix-1.8.9 (25 Nov 2011) + + 25 Nov 2011; Matthew Marlowe +zabbix-1.8.9.ebuild: + Bump for Zabbix 1.8.9 production release + + 03 Nov 2011; Mike Frysinger zabbix-1.8.3.ebuild, + zabbix-1.8.5.ebuild, zabbix-1.8.6.ebuild, zabbix-1.8.7.ebuild, + zabbix-1.8.7-r1.ebuild, zabbix-1.8.8.ebuild, zabbix-1.8.8-r1.ebuild, + zabbix-1.9.4.ebuild, zabbix-1.9.5.ebuild: + Use new egethome helper rather than calling getent directly. + + 15 Oct 2011; Markos Chandras zabbix-1.8.7-r1.ebuild: + Stable on amd64 wrt bug #386175 + + 14 Oct 2011; Andreas Schuerch zabbix-1.8.7-r1.ebuild: + x86 stable, bug 386175 + +*zabbix-1.8.8-r1 (09 Oct 2011) +*zabbix-1.8.7-r1 (09 Oct 2011) + + 09 Oct 2011; Matthew Marlowe +zabbix-1.8.7-r1.ebuild, + +zabbix-1.8.8-r1.ebuild: + Fix oracle use flag dependencies for Zabbix 1.8.7 and 1.8.8 per Bug #386457 + + 08 Oct 2011; Pawel Hajdan jr zabbix-1.8.7.ebuild: + x86 stable wrt security bug #386175 + +*zabbix-1.8.8 (01 Oct 2011) + + 01 Oct 2011; Matthew Marlowe +zabbix-1.8.8.ebuild: + Bump for minor production update to version 1.8.8 + +*zabbix-1.8.7 (01 Sep 2011) + + 01 Sep 2011; Matthew Marlowe +zabbix-1.8.7.ebuild: + Version bump to 1.8.7 which has minor new functionality plus fixes for + production + + 29 Aug 2011; Matthew Marlowe zabbix-1.9.4.ebuild, zabbix-1.9.5.ebuild: + removed keywords from 1.9 releases as they are alpha quality and only really + appropriate for feature previews at the moment + + 28 Aug 2011; Tony Vroon zabbix-1.8.6.ebuild: + Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & + Elijah El Lazkani in security bug #379693. + + 27 Aug 2011; Kacper Kowalik zabbix-1.8.3.ebuild, + zabbix-1.8.5.ebuild, zabbix-1.8.6.ebuild, zabbix-1.9.4.ebuild, + zabbix-1.9.5.ebuild: + Dropped ppc keywords wrt bug #379693 + + 27 Aug 2011; Pawel Hajdan jr zabbix-1.8.6.ebuild: + x86 stable wrt security bug #379693 + +*zabbix-1.8.6 (27 Aug 2011) + + 27 Aug 2011; Matthew Marlowe +zabbix-1.8.6.ebuild: + Bump Zabbix 1.8.6, adds formal postgresql 9.0 support for 1.8 releases, fixes + security bug #379693 + + 29 Jul 2011; Patrick Lauer zabbix-1.8.3.ebuild, + zabbix-1.8.5.ebuild, zabbix-1.8.6_rc1.ebuild, zabbix-1.9.4.ebuild, + zabbix-1.9.5.ebuild: + adding pkgconfig to deps for #367419 + +*zabbix-1.9.5 (29 Jul 2011) +*zabbix-1.8.6_rc1 (29 Jul 2011) + + 29 Jul 2011; Patrick Lauer +zabbix-1.8.6_rc1.ebuild, + +zabbix-1.9.5.ebuild: + Bump for #376847 and 1.9 alpha update + +*zabbix-1.9.4 (28 Jul 2011) + + 28 Jul 2011; Patrick Lauer -zabbix-1.6.9.ebuild, + -zabbix-1.8.4.ebuild, -zabbix-1.9.3.ebuild, +zabbix-1.9.4.ebuild: + Bump for #372365, remove old + + 08 Jul 2011; Samuli Suominen zabbix-1.6.9.ebuild, + zabbix-1.8.3.ebuild, zabbix-1.8.4.ebuild, zabbix-1.8.5.ebuild, + zabbix-1.9.3.ebuild: + Convert from "useq" to "use". + + 02 Jul 2011; Markos Chandras zabbix-1.8.5.ebuild: + Stable on amd64 wrt bug #370239 + + 01 Jul 2011; Thomas Kahle zabbix-1.8.5.ebuild: + x86 stable per bug 370239 + + 06 May 2011; Thomas Kahle zabbix-1.8.4.ebuild: + x86 stable per bug 361873 + +*zabbix-1.8.5 (27 Apr 2011) + + 27 Apr 2011; Patrick Lauer +zabbix-1.8.5.ebuild: + Bump of 1.8 + + 13 Apr 2011; Patrick Lauer zabbix-1.9.3.ebuild: + Fixing postgres useflag #361721 + + 05 Apr 2011; Christoph Mende zabbix-1.8.4.ebuild: + Stable on amd64 wrt bug #361873 + +*zabbix-1.9.3 (02 Apr 2011) + + 02 Apr 2011; Patrick Lauer +zabbix-1.9.3.ebuild: + Adding zabbix 1.9 (2.0 prerelease) + +*zabbix-1.6.9 (04 Mar 2011) + + 04 Mar 2011; Patrick Lauer +zabbix-1.6.9.ebuild: + Restoring 1.6 branch for #356589 + + 11 Feb 2011; Diego E. Pettenò zabbix-1.8.3.ebuild, + zabbix-1.8.4.ebuild: + QA: fix maintainer-mode triggered rebuild, add autotools dependencies (bug + #323901). + + 17 Jan 2011; Patrick Lauer zabbix-1.8.3.ebuild, + zabbix-1.8.4.ebuild: + Fixing use-depends for frontend useflag, #351917 + +*zabbix-1.8.4 (16 Jan 2011) + + 16 Jan 2011; Patrick Lauer +zabbix-1.8.4.ebuild: + Bump for #351312 + + 16 Jan 2011; Patrick Lauer zabbix-1.8.3.ebuild, + +files/zabbix-1.8.3-as-needed.patch: + Fixing as-needed issues #333425 + + 12 Sep 2010; Patrick Lauer -zabbix-1.8-r1.ebuild, + -zabbix-1.8.1.ebuild, -zabbix-1.8.2.ebuild: + Remove old + + 12 Sep 2010; Joseph Jezak zabbix-1.8.3.ebuild: + Marked ppc stable for bug #335071. + + 29 Aug 2010; Markos Chandras zabbix-1.8.3.ebuild: + Stable on amd64 wrt bug #335071 + + 28 Aug 2010; Pawel Hajdan jr zabbix-1.8.3.ebuild: + x86 stable wrt security bug #335071 + +*zabbix-1.8.3 (18 Aug 2010) + + 18 Aug 2010; Patrick Lauer zabbix-1.8.2.ebuild, + +zabbix-1.8.3.ebuild, metadata.xml: + Bump, fixes #326161 #327213 + + 18 Jul 2010; zabbix-1.8.2.ebuild: + ppc stable #322445 + + 14 Jul 2010; Christian Faulhammer zabbix-1.8.2.ebuild: + stable x86, bug 322445 + + 28 Jun 2010; Markos Chandras zabbix-1.8.2.ebuild: + Stable on amd64 wrt bug #322445 + + 18 Jun 2010; Patrick Lauer -zabbix-1.6.7.ebuild, + -zabbix-1.8.ebuild: + Remove old + + 17 Jun 2010; Patrick Lauer zabbix-1.6.7.ebuild, + zabbix-1.8.ebuild, zabbix-1.8-r1.ebuild, zabbix-1.8.1.ebuild, + zabbix-1.8.2.ebuild: + Migrating away from deprecated postgres virtuals + + 05 Jun 2010; Samuli Suominen zabbix-1.8.2.ebuild: + Use COMMON_DEPEND to move dev-util/pkgconfig out of RDEPEND. + + 03 May 2010; Patrick Lauer zabbix-1.8.2.ebuild: + Adding pkgconfig dep for #309155 + + 03 May 2010; Patrick Lauer zabbix-1.8.2.ebuild, + +files/zabbix-1.8.2-as-needed.patch: + as-needed fix for #313707, thanks to Yuri Vasilevski for the fixed patch + +*zabbix-1.8.2 (07 Apr 2010) + + 07 Apr 2010; Patrick Lauer +zabbix-1.8.2.ebuild: + Bump, fixes #312875 #313403. As-needed patch fails for now. + +*zabbix-1.8.1 (26 Feb 2010) + + 26 Feb 2010; Patrick Lauer +zabbix-1.8.1.ebuild: + Bump for #306935 + + 20 Feb 2010; Patrick Lauer zabbix-1.8-r1.ebuild, + +files/zabbix-as-needed.patch: + Fix for as-needed building by Yuri Vasilevski, fixes #305449 + + 12 Jan 2010; Patrick Lauer zabbix-1.8.ebuild, + zabbix-1.8-r1.ebuild: + Fixing (R)DEPEND typo, #300700 + +*zabbix-1.8-r1 (10 Jan 2010) + + 10 Jan 2010; Patrick Lauer +zabbix-1.8-r1.ebuild: + Enable ipv6 support #300340, fix php dep some more #300338 + + 09 Jan 2010; Patrick Lauer -zabbix-1.4.6.ebuild, + -zabbix-1.6.5.ebuild, -zabbix-1.6.5-r1.ebuild, -zabbix-1.6.6.ebuild, + -zabbix-1.6.6-r1.ebuild: + Remove old + + 09 Jan 2010; Patrick Lauer zabbix-1.8.ebuild: + Fixing php dep #300280 + +*zabbix-1.8 (09 Jan 2010) + + 09 Jan 2010; Patrick Lauer +zabbix-1.8.ebuild: + Bump to 1.8 #296302, fix webapp handling #300276 + +*zabbix-1.6.7 (21 Nov 2009) + + 21 Nov 2009; Patrick Lauer +zabbix-1.6.7.ebuild: + Bump, fixes #293852 + + 20 Nov 2009; Patrick Lauer metadata.xml: + Adding myself in metadata so that package doesn't go unmaintained + +*zabbix-1.6.6-r1 (06 Oct 2009) + + 06 Oct 2009; Patrick Lauer + +files/1.6.6/init.d/zabbix-proxy, +zabbix-1.6.6-r1.ebuild, + files/1.6.6/zabbix_agentd.conf, files/1.6.6/zabbix_proxy.conf, + files/1.6.6/zabbix_server.conf: + Adding proxy init script #283970 and fixing log paths #283817. Thanks to + all the reporters and testers. + +*zabbix-1.6.6 (05 Oct 2009) + + 05 Oct 2009; Patrick Lauer + +files/1.6.6/init.d/zabbix-agentd, +files/1.6.6/postinstall-en.txt, + +files/1.6.6/zabbix_agent.conf, +zabbix-1.6.6.ebuild, + +files/1.6.6/init.d/zabbix-server, +files/1.6.6/zabbix_agentd.conf, + +files/1.6.6/zabbix_proxy.conf, +files/1.6.6/zabbix_server.conf, + +files/1.6.6/zabbix_trapper.conf: + Bump to 1.6.6, closes #286655 + +*zabbix-1.6.5-r1 (05 Oct 2009) + + 05 Oct 2009; Patrick Lauer +zabbix-1.6.5-r1.ebuild: + Add hopefully working support for proxy. Should close #283970 + + 23 Sep 2009; Patrick Lauer zabbix-1.4.6.ebuild, + zabbix-1.6.5.ebuild: + Remove virtual/libc + +*zabbix-1.6.5 (01 Sep 2009) + + 01 Sep 2009; Patrick Lauer + +files/1.6.5/init.d/zabbix-agentd, +files/1.6.5/init.d/zabbix-server, + +files/1.6.5/postinstall-en.txt, +files/1.6.5/zabbix_agent.conf, + +files/1.6.5/zabbix_agentd.conf, +files/1.6.5/zabbix_proxy.conf, + +files/1.6.5/zabbix_server.conf, +files/1.6.5/zabbix_trapper.conf, + +zabbix-1.6.5.ebuild, metadata.xml: + Bump to 1.6.5. Fixes #238151. Patches by Calogero Lo Leggio. + + 04 Aug 2008; Jeroen Roovers metadata.xml: + Describe local USE flags for GLEP 56. + +*zabbix-1.4.6 (23 Jul 2008) + + 23 Jul 2008; Wolfram Schlich + -files/1.4.1/init.d/zabbix-agentd, -files/1.4.1/init.d/zabbix-server, + -files/1.4.1/postinstall-en.txt, -files/1.4.1/zabbix_agent.conf, + -files/1.4.1/zabbix_agentd.conf, -files/1.4.1/zabbix_server.conf, + -files/1.4.2/init.d/zabbix-agentd, -files/1.4.2/init.d/zabbix-server, + -files/1.4.2/initgroups.patch, -files/1.4.2/postinstall-en.txt, + -files/1.4.2/zabbix_agent.conf, -files/1.4.2/zabbix_agentd.conf, + -files/1.4.2/zabbix_server.conf, -files/1.4.3/init.d/zabbix-agentd, + -files/1.4.3/init.d/zabbix-server, -files/1.4.3/postinstall-en.txt, + -files/1.4.3/zabbix_agent.conf, -files/1.4.3/zabbix_agentd.conf, + -files/1.4.3/zabbix_server.conf, -files/1.4.4/init.d/zabbix-agentd, + -files/1.4.4/init.d/zabbix-server, -files/1.4.4/postinstall-en.txt, + -files/1.4.4/zabbix_agent.conf, -files/1.4.4/zabbix_agentd.conf, + -files/1.4.4/zabbix_server.conf, -files/1.4.5/init.d/zabbix-agentd, + -files/1.4.5/init.d/zabbix-server, -files/1.4.5/postinstall-en.txt, + -files/1.4.5/zabbix_agent.conf, -files/1.4.5/zabbix_agentd.conf, + -files/1.4.5/zabbix_server.conf, +files/1.4.6/init.d/zabbix-agentd, + +files/1.4.6/init.d/zabbix-server, +files/1.4.6/postinstall-en.txt, + +files/1.4.6/zabbix_agent.conf, +files/1.4.6/zabbix_agentd.conf, + +files/1.4.6/zabbix_server.conf, -files/1.4/init.d/zabbix-agentd, + -files/1.4/init.d/zabbix-server, -files/1.4/postinstall-en.txt, + -files/1.4/zabbix_agent.conf, -files/1.4/zabbix_agentd.conf, + -files/1.4/zabbix_server.conf, -zabbix-1.4.ebuild, -zabbix-1.4.1.ebuild, + -zabbix-1.4.2.ebuild, -zabbix-1.4.2-r1.ebuild, -zabbix-1.4.3.ebuild, + -zabbix-1.4.4.ebuild, -zabbix-1.4.5.ebuild, +zabbix-1.4.6.ebuild: + version bump, removed old versions + + 19 May 2008; Tiziano Müller zabbix-1.4.ebuild, + zabbix-1.4.1.ebuild, zabbix-1.4.2.ebuild, zabbix-1.4.2-r1.ebuild, + zabbix-1.4.3.ebuild, zabbix-1.4.4.ebuild, zabbix-1.4.5.ebuild: + Changed dependency for postgresql to virtual/postgresql-base + +*zabbix-1.4.5 (29 Mar 2008) + + 29 Mar 2008; Wolfram Schlich + +files/1.4.5/init.d/zabbix-agentd, +files/1.4.5/init.d/zabbix-server, + +files/1.4.5/postinstall-en.txt, +files/1.4.5/zabbix_agent.conf, + +files/1.4.5/zabbix_agentd.conf, +files/1.4.5/zabbix_server.conf, + +zabbix-1.4.5.ebuild: + version bump + +*zabbix-1.4.4 (17 Dec 2007) + + 17 Dec 2007; Wolfram Schlich + +files/1.4.4/init.d/zabbix-agentd, +files/1.4.4/init.d/zabbix-server, + +files/1.4.4/postinstall-en.txt, +files/1.4.4/zabbix_agent.conf, + +files/1.4.4/zabbix_agentd.conf, +files/1.4.4/zabbix_server.conf, + +zabbix-1.4.4.ebuild: + version bump + +*zabbix-1.4.3 (12 Dec 2007) + + 12 Dec 2007; Wolfram Schlich + +files/1.4.3/init.d/zabbix-agentd, +files/1.4.3/init.d/zabbix-server, + +files/1.4.3/postinstall-en.txt, +files/1.4.3/zabbix_agent.conf, + +files/1.4.3/zabbix_agentd.conf, +files/1.4.3/zabbix_server.conf, + +zabbix-1.4.3.ebuild: + version bump + +*zabbix-1.4.2-r1 (03 Dec 2007) + + 03 Dec 2007; Wolfram Schlich + +files/1.4.2/initgroups.patch, +zabbix-1.4.2-r1.ebuild: + Added initgroups patch from + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452682 + +*zabbix-1.4.2 (24 Aug 2007) + + 24 Aug 2007; Wolfram Schlich + +files/1.4.2/init.d/zabbix-agentd, +files/1.4.2/init.d/zabbix-server, + +files/1.4.2/postinstall-en.txt, +files/1.4.2/zabbix_agent.conf, + +files/1.4.2/zabbix_agentd.conf, +files/1.4.2/zabbix_server.conf, + +zabbix-1.4.2.ebuild: + version bump + +*zabbix-1.4.1 (24 Jul 2007) + + 24 Jul 2007; Wolfram Schlich + +files/1.4.1/init.d/zabbix-agentd, +files/1.4.1/init.d/zabbix-server, + +files/1.4.1/postinstall-en.txt, +files/1.4.1/zabbix_agent.conf, + +files/1.4.1/zabbix_agentd.conf, +files/1.4.1/zabbix_server.conf, + +zabbix-1.4.1.ebuild: + version bump + +*zabbix-1.4 (08 Jun 2007) + + 08 Jun 2007; Wolfram Schlich + +files/1.4/init.d/zabbix-agentd, +files/1.4/init.d/zabbix-server, + +files/1.4/postinstall-en.txt, +files/1.4/zabbix_agent.conf, + +files/1.4/zabbix_agentd.conf, +files/1.4/zabbix_server.conf, + +metadata.xml, +zabbix-1.4.ebuild: + initial import diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest new file mode 100644 index 0000000..9c87700 --- /dev/null +++ b/net-analyzer/zabbix/Manifest @@ -0,0 +1,4 @@ +DIST zabbix-2.4.1.tar.gz 14730972 SHA256 e47b328c2babcc7c37b27c96732b5f6ac28a935901acf8a3d340887ba64bece4 SHA512 8cf19262503ade91188cc6a9653fd2f13c966cc2638b9c36f1ecfb989707fc991cfa3bfa487b0c8a230caa6e344105a4494fd3981d8b09c07048842369e71dc2 WHIRLPOOL 5907ef1eb71c175879e93be7151a1c313a5a90d05ffdd1a2189beb22133fa08d24fb72749e0e9a13fa7a6a5b3eb0470d0331e05cd15e2f77ffdb616d5aaf24ec +EBUILD zabbix-2.4.1.ebuild 10177 SHA256 477f77001c7016053d06c7351c5e6ad4c379b446ae8324df2faee6597b4bf537 SHA512 9de8e70b19602f37570ead0f64e170899d4545f2a14b371e0c9041ea14d210ae6a9e2e34ce8f42ec4b44826ec81163119dc9cd4bfb01009baa49e3d903a0ac8e WHIRLPOOL beea7f7f1374299a1804ba41de2db2cbcfa97878b57d3345f67ae680a1f54d48bf287e7d6914737f59bee1fbe1501582f1bea4f2f784077757577e9d348ef423 +MISC ChangeLog 38192 SHA256 ab3ae5d2bbc07db9b986e109ab9f17e888ea96246bfdd091063f96c760546ec9 SHA512 73ec2d31906aebf07a05edf0184dfaa964ed41249f7e05ec093c137ea1151cc44248591216c55b6360e7fdebfc1627d58918648b6408c96bf1d9f6bca8e5978b WHIRLPOOL 645a94821eefa0cffcf58208f7eebeac6491030dca8bb7ddd6e6bdbc6681f3299e5259efba86856d12de92bf014f91cfaefc0f249ad2d21537a175c56a3b959e +MISC metadata.xml 1221 SHA256 94d1841cf3efb9a709dbc9ee160a29c394a1c0f5af5069fe1466f9f08796c72d SHA512 3d3ed8e75fcd9f521402a9734d5bd19c163a7a5d33cef3b20b6e476416fc352a91a62782ecc0ed032efbafd5f07f6ac08e28a88fb766095a1bba146f8f50b5e5 WHIRLPOOL ae2d69cab99c364721ca2e806fc5e02d1dbe72ad48bea43b4d1a0fd49c00cc2b94ea6ea85f4f5a9ff90522a90ade17fe816fe85ca7a16e755d02239d4426da92 diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml new file mode 100644 index 0000000..ab30633 --- /dev/null +++ b/net-analyzer/zabbix/metadata.xml @@ -0,0 +1,27 @@ + + + + +mattm@gentoo.org +Matthew Marlowe + + +ZABBIX is software for monitoring of your applications, network and servers. +ZABBIX supports both polling and trapping techniques to collect data from +monitored hosts. A flexible notification mechanism allows easy and quickly +configure different types of notifications for pre-defined events. + + + Enable zabbix agent (for to-be-monitored machines) + Enable zabbix web frontend + Turn on support of IPv6 + Enable proxy support + Enable openipmi things + Enable zabbix server + SSH v2 based checks + Enable Database Monitor and use UnixODBC Library by default + Build statically linked binaries + Enable Zabbix Java JMX Management Gateway + Use libxml2 client library + + diff --git a/net-analyzer/zabbix/zabbix-2.4.1.ebuild b/net-analyzer/zabbix/zabbix-2.4.1.ebuild new file mode 100644 index 0000000..cedb035 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-2.4.1.ebuild @@ -0,0 +1,365 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.5.ebuild,v 1.4 2014/10/12 08:56:52 ago Exp $ + +EAPI="5" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit flag-o-matic webapp depend.php autotools java-pkg-opt-2 user systemd toolchain-funcs + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="http://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="amd64 x86" +IUSE="agent java curl frontend ipv6 jabber ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" + +COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) + ldap? ( + net-nds/openldap + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + ) + mysql? ( >=virtual/mysql-5.0.3 ) + sqlite? ( >=dev-db/sqlite-3.3.5 ) + postgres? ( >=dev-db/postgresql-base-8.3.0 ) + oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) + jabber? ( dev-libs/iksemel ) + libxml2? ( dev-libs/libxml2 ) + curl? ( net-misc/curl ) + openipmi? ( sys-libs/openipmi ) + ssh? ( net-libs/libssh2 ) + java? ( >=virtual/jdk-1.4 ) + odbc? ( dev-db/unixODBC )" + +RDEPEND="${COMMON_DEPEND} + proxy? ( <=net-analyzer/fping-2.9 ) + server? ( <=net-analyzer/fping-2.9 + app-admin/webapp-config ) + java? ( + >=virtual/jre-1.4 + dev-java/slf4j-api + dev-java/json-simple + ) + frontend? ( + >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +ZABBIXJAVA_BASE="opt/zabbix_java" + +java_prepare() { + cd "${S}/src/zabbix_java/lib" + rm -v *.jar || die + + java-pkg_jar-from slf4j-api + java-pkg_jar-from json-simple +} + +src_prepare() { + eautoreconf +} + +pkg_setup() { + if use server || use proxy ; then + local dbnum dbtypes="mysql oracle postgres sqlite" dbtype + declare -i dbnum=0 + for dbtype in ${dbtypes}; do + use ${dbtype} && let dbnum++ + done + if [ ${dbnum} -gt 1 ]; then + eerror + eerror "You can't use more than one database type in Zabbix." + eerror "Select exactly one database type out of these: ${dbtypes}" + eerror + die "Multiple database types selected." + elif [ ${dbnum} -lt 1 ]; then + eerror + eerror "Select exactly one database type out of these: ${dbtypes}" + eerror + die "No database type selected." + fi + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + if has_version 'dev-db/oracle-instantclient-basic'; then + ewarn + ewarn "Please ensure you have a full install of the Oracle client." + ewarn "dev-db/oracle-instantclient* is NOT sufficient." + ewarn + fi + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + enewgroup zabbix + enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix," + elog "if you have not already done so. " + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" + ewarn "using sendxmpp for Jabber alerts)." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n " + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + elog "Feel free to download or contribute gentoo specific zabbix templates" + elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP)." + + # repeat fowners/fperms functionality from src_install() + # here to catch wrong permissions on existing files in + # the live filesystem (yeah, that sucks). + chown -R zabbix:zabbix \ + "${ROOT}"/etc/zabbix \ + "${ROOT}"/var/lib/zabbix \ + "${ROOT}"/var/lib/zabbix/home \ + "${ROOT}"/var/lib/zabbix/scripts \ + "${ROOT}"/var/log/zabbix + chmod 0750 \ + "${ROOT}"/etc/zabbix \ + "${ROOT}"/var/lib/zabbix \ + "${ROOT}"/var/lib/zabbix/home \ + "${ROOT}"/var/lib/zabbix/scripts \ + "${ROOT}"/var/log/zabbix + + chmod 0640 \ + "${ROOT}"/etc/zabbix/zabbix_* + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ;; + esac + fi +} + +src_configure() { + + econf \ + $(use_enable server) \ + $(use_enable proxy) \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_enable static) \ + $(use_enable java) \ + $(use_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres postgresql) \ + $(use_with oracle) \ + $(use_with sqlite sqlite3) \ + $(use_with jabber) \ + $(use_with curl libcurl) \ + $(use_with openipmi openipmi) \ + $(use_with ssh ssh2) \ + $(use_with libxml2) \ + $(use_with odbc unixodbc) \ + || die "econf failed" +} + +src_install() { + dodir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + if use server; then + insinto /etc/zabbix + doins "${FILESDIR}/2.2"/zabbix_server.conf + doinitd "${FILESDIR}/2.2"/init.d/zabbix-server + dosbin src/zabbix_server/zabbix_server + fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-server.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf + fi + + if use proxy; then + doinitd \ + "${FILESDIR}/2.2"/init.d/zabbix-proxy + dosbin \ + src/zabbix_proxy/zabbix_proxy + insinto /etc/zabbix + doins \ + "${FILESDIR}/2.2"/zabbix_proxy.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-proxy.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins \ + "${FILESDIR}/2.2"/zabbix_agent.conf \ + "${FILESDIR}/2.2"/zabbix_agentd.conf + doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd + dosbin \ + src/zabbix_agent/zabbix_agent \ + src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + fowners zabbix:zabbix \ + /etc/zabbix/zabbix_agent.conf \ + /etc/zabbix/zabbix_agentd.conf + fperms 0640 \ + /etc/zabbix/zabbix_agent.conf \ + /etc/zabbix/zabbix_agentd.conf + systemd_dounit "${FILESDIR}/zabbix-agentd.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf + fi + + fowners zabbix:zabbix \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agent.conf \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" + webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-0.9.27.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-0.9.27.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/org-json-2010-12-28.jar \ + src/zabbix_java/lib/slf4j-api-1.6.1.jar + exeinto /${ZABBIXJAVA_BASE}/ + doexe \ + src/zabbix_java/settings.sh \ + src/zabbix_java/startup.sh \ + src/zabbix_java/shutdown.sh + fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} + fi + +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + fi +} From 8a6235a9614d9f9620bc7a69aa5b3ece1bdfb77a Mon Sep 17 00:00:00 2001 From: Matthias Drobny Date: Wed, 15 Oct 2014 16:43:43 +0200 Subject: [PATCH 2/8] =?UTF-8?q?Standardkonfigurationen=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zabbix/files/2.4/init.d/zabbix-agentd | 29 + .../zabbix/files/2.4/init.d/zabbix-proxy | 28 + .../zabbix/files/2.4/init.d/zabbix-server | 27 + .../zabbix/files/2.4/zabbix_agent.conf | 87 +++ .../zabbix/files/2.4/zabbix_agentd.conf | 294 +++++++++ .../zabbix/files/2.4/zabbix_agentd.win.conf | 259 ++++++++ .../zabbix/files/2.4/zabbix_proxy.conf | 559 +++++++++++++++++ .../zabbix/files/2.4/zabbix_server.conf | 561 ++++++++++++++++++ net-analyzer/zabbix/zabbix-2.4.1.ebuild | 14 +- 9 files changed, 1851 insertions(+), 7 deletions(-) create mode 100644 net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd create mode 100644 net-analyzer/zabbix/files/2.4/init.d/zabbix-proxy create mode 100644 net-analyzer/zabbix/files/2.4/init.d/zabbix-server create mode 100644 net-analyzer/zabbix/files/2.4/zabbix_agent.conf create mode 100644 net-analyzer/zabbix/files/2.4/zabbix_agentd.conf create mode 100644 net-analyzer/zabbix/files/2.4/zabbix_agentd.win.conf create mode 100644 net-analyzer/zabbix/files/2.4/zabbix_proxy.conf create mode 100644 net-analyzer/zabbix/files/2.4/zabbix_server.conf diff --git a/net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd new file mode 100644 index 0000000..348265d --- /dev/null +++ b/net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd @@ -0,0 +1,29 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd,v 1.1 2013/11/16 07:18:54 mattm Exp $ + +pid_file="/run/zabbix/zabbix_agentd.pid" + +depend() { + need net + provide zabbix-agent + use zabbix-server +} + +start_pre() { + checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix +} + +start() { + ebegin "Starting Zabbix agent" + start-stop-daemon --start --pidfile ${pid_file} \ + --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf + eend $? +} + +stop() { + ebegin "Stopping Zabbix agent" + start-stop-daemon --stop --pidfile ${pid_file} + eend $? +} diff --git a/net-analyzer/zabbix/files/2.4/init.d/zabbix-proxy b/net-analyzer/zabbix/files/2.4/init.d/zabbix-proxy new file mode 100644 index 0000000..38bce75 --- /dev/null +++ b/net-analyzer/zabbix/files/2.4/init.d/zabbix-proxy @@ -0,0 +1,28 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy,v 1.1 2013/11/16 07:18:54 mattm Exp $ + +pid_file="/run/zabbix/zabbix_proxy.pid" + +depend() { + need net + provide zabbix-proxy +} + +start_pre() { + checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix +} + +start() { + ebegin "Starting Zabbix proxy" + start-stop-daemon --start --pidfile ${pid_file} \ + --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf + eend $? +} + +stop() { + ebegin "Stopping Zabbix proxy" + start-stop-daemon --stop --pidfile ${pid_file} + eend $? +} diff --git a/net-analyzer/zabbix/files/2.4/init.d/zabbix-server b/net-analyzer/zabbix/files/2.4/init.d/zabbix-server new file mode 100644 index 0000000..bd17c19 --- /dev/null +++ b/net-analyzer/zabbix/files/2.4/init.d/zabbix-server @@ -0,0 +1,27 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.2/init.d/zabbix-server,v 1.1 2013/11/16 07:18:54 mattm Exp $ + +pid_file="/run/zabbix/zabbix_server.pid" + +depend() { + need net + use mysql postgresql +} +start_pre() { + checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix +} + +start() { + ebegin "Starting Zabbix server" + start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \ + --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf + eend $? +} + +stop() { + ebegin "Stopping Zabbix server" + start-stop-daemon --stop --pidfile ${pid_file} + eend $? +} diff --git a/net-analyzer/zabbix/files/2.4/zabbix_agent.conf b/net-analyzer/zabbix/files/2.4/zabbix_agent.conf new file mode 100644 index 0000000..2dada70 --- /dev/null +++ b/net-analyzer/zabbix/files/2.4/zabbix_agent.conf @@ -0,0 +1,87 @@ +# This is a config file for Zabbix internet service daemon agent +# To get more information about Zabbix visit http://www.zabbix.com + +### Option: Server +# IP address of Zabbix server +# Connections from other hosts will be denied +# 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=127.0.0.1 + +############ ADVANCED PARAMETERS ################# + +### Option: Alias +# Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one. +# Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed. +# Different Alias keys may reference the same item key. +# For example, to retrieve the ID of user 'zabbix': +# Alias=zabbix.userid:vfs.file.regexp[/etc/passwd,^zabbix:.:([0-9]+),,,,\1] +# Now shorthand key zabbix.userid may be used to retrieve data. +# +# Mandatory: no +# Range: +# Default: + +### 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. +# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/usr/local/etc/zabbix_agent.userparams.conf +# Include=/usr/local/etc/zabbix_agent.conf.d/ +# Include=/usr/local/etc/zabbix_agent.conf.d/*.conf + +####### 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 +# Default: +# UnsafeUserParameters=0 + +### Option: UserParameter +# User-defined parameter to monitor. There can be several user-defined parameters. +# Format: UserParameter=, +# See 'zabbix_agentd' directory for examples. +# +# Mandatory: no +# Default: +# UserParameter= + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of agent modules. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# LoadModulePath=${libdir}/modules + +### Option: LoadModule +# Module to load at agent startup. Modules are used to extend functionality of the agent. +# Format: LoadModule= +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= diff --git a/net-analyzer/zabbix/files/2.4/zabbix_agentd.conf b/net-analyzer/zabbix/files/2.4/zabbix_agentd.conf new file mode 100644 index 0000000..1a76d61 --- /dev/null +++ b/net-analyzer/zabbix/files/2.4/zabbix_agentd.conf @@ -0,0 +1,294 @@ +# This is a config file for the Zabbix agent daemon (Unix) +# To get more information about Zabbix, visit http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: PidFile +# Name of PID file. +# +# Mandatory: no +# Default: +# PidFile=/tmp/zabbix_agentd.pid + +### Option: LogFile +# Name of log file. +# If not set, syslog is used. +# +# Mandatory: no +# Default: +# LogFile= + +LogFile=/tmp/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 - basic information about starting and stopping of Zabbix processes +# 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. +# Incoming connections will be accepted only from the hosts listed here. +# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. +# +# Mandatory: no +# Default: +# Server= + +Server=127.0.0.1 + +### 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. +# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +### Option: StartAgents +# Number of pre-forked instances of zabbix_agentd that process passive checks. +# If set to 0, disables passive checks and the agent will not listen on any TCP port. +# +# Mandatory: no +# Range: 0-100 +# Default: +# StartAgents=3 + +##### Active checks related + +### Option: ServerActive +# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. +# If port is not specified, default port is used. +# IPv6 addresses must be enclosed in square brackets if port for that host is specified. +# If port is not specified, square brackets for IPv6 addresses are optional. +# If this parameter is not specified, active checks are disabled. +# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] +# +# Mandatory: no +# 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. +# Value is acquired from HostnameItem if undefined. +# +# Mandatory: no +# Default: +# Hostname= + +Hostname=Zabbix server + +### Option: HostnameItem +# Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. +# Does not support UserParameters or aliases. +# +# Mandatory: no +# Default: +# HostnameItem=system.hostname + +### Option: HostMetadata +# Optional parameter that defines host metadata. +# Host metadata is used at host auto-registration process. +# An agent will issue an error and not start if the value is over limit of 255 characters. +# If not defined, value will be acquired from HostMetadataItem. +# +# Mandatory: no +# Range: 0-255 characters +# Default: +# HostMetadata= + +### Option: HostMetadataItem +# Optional parameter that defines an item used for getting host metadata. +# Host metadata is used at host auto-registration process. +# During an auto-registration request an agent will log a warning message if +# the value returned by specified item is over limit of 255 characters. +# This option is only used when HostMetadata is not defined. +# +# Mandatory: no +# Default: +# HostMetadataItem= + +### 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: Alias +# Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one. +# Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed. +# Different Alias keys may reference the same item key. +# For example, to retrieve the ID of user 'zabbix': +# Alias=zabbix.userid:vfs.file.regexp[/etc/passwd,^zabbix:.:([0-9]+),,,,\1] +# Now shorthand key zabbix.userid may be used to retrieve data. +# Aliases can be used in HostMetadataItem but not in HostnameItem parameters. +# +# Mandatory: no +# Range: +# Default: + +### Option: Timeout +# Spend no more than Timeout seconds on processing +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: AllowRoot +# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent +# will try to switch to the user specified by the User configuration option instead. +# Has no effect if started under a regular user. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Default: +# AllowRoot=0 + +### Option: User +# Drop privileges to a specific, existing user on the system. +# Only has effect if run as 'root' and AllowRoot is disabled. +# +# Mandatory: no +# Default: +# User=zabbix + +### Option: Include +# You may include individual files or all files in a directory in the configuration file. +# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/usr/local/etc/zabbix_agentd.userparams.conf +# Include=/usr/local/etc/zabbix_agentd.conf.d/ +# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf + +####### 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=, +# See 'zabbix_agentd' directory for examples. +# +# Mandatory: no +# Default: +# UserParameter= + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of agent modules. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# LoadModulePath=${libdir}/modules + +### Option: LoadModule +# Module to load at agent startup. Modules are used to extend functionality of the agent. +# Format: LoadModule= +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= diff --git a/net-analyzer/zabbix/files/2.4/zabbix_agentd.win.conf b/net-analyzer/zabbix/files/2.4/zabbix_agentd.win.conf new file mode 100644 index 0000000..a32d328 --- /dev/null +++ b/net-analyzer/zabbix/files/2.4/zabbix_agentd.win.conf @@ -0,0 +1,259 @@ +# This is a config file for the Zabbix agent daemon (Windows) +# To get more information about Zabbix, go to http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: LogFile +# Name of log file. +# If not set, Windows Event Log is used. +# +# Mandatory: no +# Default: +# LogFile= + +LogFile=c:\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 - basic information about starting and stopping of Zabbix processes +# 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. +# Incoming connections will be accepted only from the hosts listed here. +# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. +# +# Mandatory: no +# Default: +# Server= + +Server=127.0.0.1 + +### 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. +# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +### Option: StartAgents +# Number of pre-forked instances of zabbix_agentd that process passive checks. +# If set to 0, disables passive checks and the agent will not listen on any TCP port. +# +# Mandatory: no +# Range: 0-100 +# Default: +# StartAgents=3 + +##### Active checks related + +### Option: ServerActive +# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. +# If port is not specified, default port is used. +# IPv6 addresses must be enclosed in square brackets if port for that host is specified. +# If port is not specified, square brackets for IPv6 addresses are optional. +# If this parameter is not specified, active checks are disabled. +# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] +# +# Mandatory: no +# 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. +# Value is acquired from HostnameItem if undefined. +# +# Mandatory: no +# Default: +# Hostname= + +Hostname=Windows host + +### Option: HostnameItem +# Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. +# Does not support UserParameters or aliases. +# +# Mandatory: no +# Default: +# HostnameItem=system.hostname + +### Option: HostMetadata +# Optional parameter that defines host metadata. +# Host metadata is used at host auto-registration process. +# An agent will issue an error and not start if the value is over limit of 255 characters. +# If not defined, value will be acquired from HostMetadataItem. +# +# Mandatory: no +# Range: 0-255 characters +# Default: +# HostMetadata= + +### Option: HostMetadataItem +# Optional parameter that defines an item used for getting host metadata. +# Host metadata is used at host auto-registration process. +# During an auto-registration request an agent will log a warning message if +# the value returned by specified item is over limit of 255 characters. +# This option is only used when HostMetadata is not defined. +# +# Mandatory: no +# Default: +# HostMetadataItem= + +### 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', 'logrt' and 'eventlog' active checks. +# The provided value will be overridden by the parameter 'maxlines', +# provided in 'log', 'logrt' or 'eventlog' item keys. +# +# Mandatory: no +# Range: 1-1000 +# Default: +# MaxLinesPerSecond=100 + +############ ADVANCED PARAMETERS ################# + +### Option: Alias +# Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one. +# Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed. +# Different Alias keys may reference the same item key. +# For example, to retrieve paging file usage in percents from the server: +# Alias=pg_usage:perf_counter[\Paging File(_Total)\% Usage] +# Now shorthand key pg_usage may be used to retrieve data. +# Aliases can be used in HostMetadataItem but not in HostnameItem or PerfCounter parameters. +# +# Mandatory: no +# Range: +# Default: + +### Option: Timeout +# Spend no more than Timeout seconds on processing +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: PerfCounter +# Syntax: ,"", +# Defines new parameter which is an average value for system performance counter for the specified time period (in seconds). +# For example, if you wish to receive average number of processor interrupts per second for last minute, you can define new parameter "interrupts" as following: +# PerfCounter = interrupts,"\Processor(0)\Interrupts/sec",60 +# Please note double quotes around performance counter path. +# Samples for calculating average value will be taken every second. +# You may run "typeperf -qx" to get list of all performance counters available in Windows. +# +# Mandatory: no +# Range: +# Default: + +### Option: Include +# You may include individual files in the configuration file. +# +# Mandatory: no +# Default: +# Include= + +# Include=c:\zabbix\zabbix_agentd.userparams.conf +# Include=c:\zabbix\zabbix_agentd.conf.d\ +# Include=c:\zabbix\zabbix_agentd.conf.d\*.conf + +####### 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=, +# +# Mandatory: no +# Default: +# UserParameter= diff --git a/net-analyzer/zabbix/files/2.4/zabbix_proxy.conf b/net-analyzer/zabbix/files/2.4/zabbix_proxy.conf new file mode 100644 index 0000000..964db48 --- /dev/null +++ b/net-analyzer/zabbix/files/2.4/zabbix_proxy.conf @@ -0,0 +1,559 @@ +# This is a configuration file for Zabbix Proxy process +# To get more information about Zabbix, +# visit http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: ProxyMode +# Proxy operating mode +# 0 - proxy in the active mode +# 1 - proxy in the passive mode +# +# Mandatory: no +# Default: +# ProxyMode=0 + +### Option: Server +# IP address (or hostname) of Zabbix server. +# Active proxy will get configuration data from the server. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: yes (if ProxyMode is set to 0) +# Default: +# Server= + +Server=127.0.0.1 + +### Option: ServerPort +# Port of Zabbix trapper on Zabbix server. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ServerPort=10051 + +### Option: Hostname +# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server! +# Value is acquired from HostnameItem if undefined. +# +# Mandatory: no +# Default: +# Hostname= + +Hostname=Zabbix proxy + +### Option: HostnameItem +# Item used for generating Hostname if it is undefined. +# Ignored if Hostname is defined. +# +# Mandatory: no +# Default: +# HostnameItem=system.hostname + +### Option: ListenPort +# Listen port for trapper. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ListenPort=10051 + +### Option: SourceIP +# Source IP address for outgoing connections. +# +# Mandatory: no +# Default: +# SourceIP= + +### Option: LogFile +# Name of log file. +# If not set, syslog is used. +# +# Mandatory: no +# Default: +# LogFile= + +LogFile=/tmp/zabbix_proxy.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 - basic information about starting and stopping of Zabbix processes +# 1 - critical information +# 2 - error information +# 3 - warnings +# 4 - for debugging (produces lots of information) +# +# Mandatory: no +# Range: 0-4 +# Default: +# DebugLevel=3 + +### Option: PidFile +# Name of PID file. +# +# Mandatory: no +# Default: +# PidFile=/tmp/zabbix_proxy.pid + +### Option: DBHost +# Database host name. +# If set to localhost, socket is used for MySQL. +# If set to empty string, socket is used for PostgreSQL. +# +# Mandatory: no +# Default: +# DBHost=localhost + +### Option: DBName +# Database name. +# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. +# Warning: do not attempt to use the same database Zabbix server is using. +# +# Mandatory: yes +# Default: +# DBName= + +DBName=zabbix_proxy + +### Option: DBSchema +# Schema name. Used for IBM DB2 and PostgreSQL. +# +# Mandatory: no +# Default: +# DBSchema= + +### Option: DBUser +# Database user. Ignored for SQLite. +# +# Default: +# DBUser= + +DBUser=root + +### Option: DBPassword +# Database password. Ignored for SQLite. +# Comment this line if no password is used. +# +# Mandatory: no +# Default: +# DBPassword= + +### Option: DBSocket +# Path to MySQL socket. +# +# Mandatory: no +# Default: +# DBSocket=/tmp/mysql.sock + +# Option: DBPort +# Database port when not using local socket. Ignored for SQLite. +# +# Mandatory: no +# Default (for MySQL): +# DBPort=3306 + +######### PROXY SPECIFIC PARAMETERS ############# + +### Option: ProxyLocalBuffer +# Proxy will keep data locally for N hours, even if the data have already been synced with the server. +# This parameter may be used if local data will be used by third party applications. +# +# Mandatory: no +# Range: 0-720 +# Default: +# ProxyLocalBuffer=0 + +### Option: ProxyOfflineBuffer +# Proxy will keep data for N hours in case if no connectivity with Zabbix Server. +# Older data will be lost. +# +# Mandatory: no +# Range: 1-720 +# Default: +# ProxyOfflineBuffer=1 + +### Option: HeartbeatFrequency +# Frequency of heartbeat messages in seconds. +# Used for monitoring availability of Proxy on server side. +# 0 - heartbeat messages disabled. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 0-3600 +# Default: +# HeartbeatFrequency=60 + +### Option: ConfigFrequency +# How often proxy retrieves configuration data from Zabbix Server in seconds. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1-3600*24*7 +# Default: +# ConfigFrequency=3600 + +### Option: DataSenderFrequency +# Proxy will send collected data to the Server every N seconds. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# DataSenderFrequency=1 + +############ ADVANCED PARAMETERS ################ + +### Option: StartPollers +# Number of pre-forked instances of pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollers=5 + +### Option: StartIPMIPollers +# Number of pre-forked instances of IPMI pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartIPMIPollers=0 + +### Option: StartPollersUnreachable +# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). +# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers +# are started. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollersUnreachable=1 + +### Option: StartTrappers +# Number of pre-forked instances of trappers. +# Trappers accept incoming connections from Zabbix sender and active agents. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartTrappers=5 + +### Option: StartPingers +# Number of pre-forked instances of ICMP pingers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPingers=1 + +### Option: StartDiscoverers +# Number of pre-forked instances of discoverers. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartDiscoverers=1 + +### Option: StartHTTPPollers +# Number of pre-forked instances of HTTP pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartHTTPPollers=1 + +### Option: JavaGateway +# IP address (or hostname) of Zabbix Java gateway. +# Only required if Java pollers are started. +# +# Mandatory: no +# Default: +# JavaGateway= + +### Option: JavaGatewayPort +# Port that Zabbix Java gateway listens on. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# JavaGatewayPort=10052 + +### Option: StartJavaPollers +# Number of pre-forked instances of Java pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartJavaPollers=0 + +### Option: StartVMwareCollectors +# Number of pre-forked vmware collector instances. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartVMwareCollectors=0 + +### Option: VMwareFrequency +# How often Zabbix will connect to VMware service to obtain a new data. +# +# Mandatory: no +# Range: 10-86400 +# Default: +# VMwareFrequency=60 + +### Option: VMwareCacheSize +# Size of VMware cache, in bytes. +# Shared memory size for storing VMware data. +# Only used if VMware collectors are started. +# +# Mandatory: no +# Range: 256K-2G +# Default: +# VMwareCacheSize=8M + +### Option: SNMPTrapperFile +# Temporary file used for passing data from SNMP trap daemon to the proxy. +# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. +# +# Mandatory: no +# Default: +# SNMPTrapperFile=/tmp/zabbix_traps.tmp + +### Option: StartSNMPTrapper +# If 1, SNMP trapper process is started. +# +# Mandatory: no +# Range: 0-1 +# Default: +# StartSNMPTrapper=0 + +### Option: ListenIP +# List of comma delimited IP addresses that the trapper should listen on. +# Trapper will listen on all network interfaces if this parameter is missing. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +### Option: HousekeepingFrequency +# How often Zabbix will perform housekeeping procedure (in hours). +# Housekeeping is removing unnecessary information from proxy history tables. +# To prevent housekeeper from being overloaded, no more than 4xHousekeepingFrequency hours +# of outdated history are deleted in one housekeeping cycle. +# To lower load on proxy startup housekeeping is postponed for 30 minutes after proxy start. +# +# Mandatory: no +# Range: 1-24 +# Default: +# HousekeepingFrequency=1 + +### Option: CacheSize +# Size of configuration cache, in bytes. +# Shared memory size, for storing hosts and items data. +# +# Mandatory: no +# Range: 128K-8G +# Default: +# CacheSize=8M + +### Option: StartDBSyncers +# Number of pre-forked instances of DB Syncers +# +# Mandatory: no +# Range: 1-100 +# Default: +# StartDBSyncers=4 + +### Option: HistoryCacheSize +# Size of history cache, in bytes. +# Shared memory size for storing history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryCacheSize=8M + +### Option: HistoryTextCacheSize +# Size of text history cache, in bytes. +# Shared memory size for storing character, text or log history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryTextCacheSize=16M + +### Option: Timeout +# Specifies how long we wait for agent, SNMP device or external check (in seconds). +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: TrapperTimeout +# Specifies how many seconds trapper may spend processing new data. +# +# Mandatory: no +# Range: 1-300 +# Default: +# TrapperTimeout=300 + +### Option: UnreachablePeriod +# After how many seconds of unreachability treat a host as unavailable. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachablePeriod=45 + +### Option: UnavailableDelay +# How often host is checked for availability during the unavailability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnavailableDelay=60 + +### Option: UnreachableDelay +# How often host is checked for availability during the unreachability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachableDelay=15 + +### Option: ExternalScripts +# Full path to location of external scripts. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# ExternalScripts=${datadir}/zabbix/externalscripts + +### Option: FpingLocation +# Location of fping. +# Make sure that fping binary has root ownership and SUID flag set. +# +# Mandatory: no +# Default: +# FpingLocation=/usr/sbin/fping + +### Option: Fping6Location +# Location of fping6. +# Make sure that fping6 binary has root ownership and SUID flag set. +# Make empty if your fping utility is capable to process IPv6 addresses. +# +# Mandatory: no +# Default: +# Fping6Location=/usr/sbin/fping6 + +### Option: SSHKeyLocation +# Location of public and private keys for SSH checks and actions. +# +# Mandatory: no +# Default: +# SSHKeyLocation= + +### Option: LogSlowQueries +# How long a database query may take before being logged (in milliseconds). +# Only works if DebugLevel set to 3 or 4. +# 0 - don't log slow queries. +# +# Mandatory: no +# Range: 1-3600000 +# Default: +# LogSlowQueries=0 + +### Option: TmpDir +# Temporary directory. +# +# Mandatory: no +# Default: +# TmpDir=/tmp + +### Option: AllowRoot +# Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy +# will try to switch to the user specified by the User configuration option instead. +# Has no effect if started under a regular user. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Default: +# AllowRoot=0 + +### Option: User +# Drop privileges to a specific, existing user on the system. +# Only has effect if run as 'root' and AllowRoot is disabled. +# +# Mandatory: no +# Default: +# User=zabbix + +### Option: Include +# You may include individual files or all files in a directory in the configuration file. +# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/usr/local/etc/zabbix_proxy.general.conf +# Include=/usr/local/etc/zabbix_proxy.conf.d/ +# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf + +### Option: SSLCertLocation +# Location of SSL client certificates. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLCertLocation=${datadir}/zabbix/ssl/certs + +### Option: SSLKeyLocation +# Location of private keys for SSL client certificates. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLKeyLocation=${datadir}/zabbix/ssl/keys + +### Option: SSLCALocation +# Location of certificate authority (CA) files for SSL server certificate verification. +# If not set, system-wide directory will be used. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLCALocation= + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of proxy modules. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# LoadModulePath=${libdir}/modules + +### Option: LoadModule +# Module to load at proxy startup. Modules are used to extend functionality of the proxy. +# Format: LoadModule= +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= diff --git a/net-analyzer/zabbix/files/2.4/zabbix_server.conf b/net-analyzer/zabbix/files/2.4/zabbix_server.conf new file mode 100644 index 0000000..5ff9fa1 --- /dev/null +++ b/net-analyzer/zabbix/files/2.4/zabbix_server.conf @@ -0,0 +1,561 @@ +# This is a configuration file for Zabbix Server process +# To get more information about Zabbix, +# visit http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: ListenPort +# Listen port for trapper. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ListenPort=10051 + +### Option: SourceIP +# Source IP address for outgoing connections. +# +# Mandatory: no +# Default: +# SourceIP= + +### Option: LogFile +# Name of log file. +# If not set, syslog is used. +# +# Mandatory: no +# Default: +# LogFile= + +LogFile=/tmp/zabbix_server.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 - basic information about starting and stopping of Zabbix processes +# 1 - critical information +# 2 - error information +# 3 - warnings +# 4 - for debugging (produces lots of information) +# +# Mandatory: no +# Range: 0-4 +# Default: +# DebugLevel=3 + +### Option: PidFile +# Name of PID file. +# +# Mandatory: no +# Default: +# PidFile=/tmp/zabbix_server.pid + +### Option: DBHost +# Database host name. +# If set to localhost, socket is used for MySQL. +# If set to empty string, socket is used for PostgreSQL. +# +# Mandatory: no +# Default: +# DBHost=localhost + +### Option: DBName +# Database name. +# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. +# +# Mandatory: yes +# Default: +# DBName= + +DBName=zabbix + +### Option: DBSchema +# Schema name. Used for IBM DB2 and PostgreSQL. +# +# Mandatory: no +# Default: +# DBSchema= + +### Option: DBUser +# Database user. Ignored for SQLite. +# +# Mandatory: no +# Default: +# DBUser= + +DBUser=root + +### Option: DBPassword +# Database password. Ignored for SQLite. +# Comment this line if no password is used. +# +# Mandatory: no +# Default: +# DBPassword= + +### Option: DBSocket +# Path to MySQL socket. +# +# Mandatory: no +# Default: +# DBSocket=/tmp/mysql.sock + +### Option: DBPort +# Database port when not using local socket. Ignored for SQLite. +# +# Mandatory: no +# Range: 1024-65535 +# Default (for MySQL): +# DBPort=3306 + +############ ADVANCED PARAMETERS ################ + +### Option: StartPollers +# Number of pre-forked instances of pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollers=5 + +### Option: StartIPMIPollers +# Number of pre-forked instances of IPMI pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartIPMIPollers=0 + +### Option: StartPollersUnreachable +# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). +# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers +# are started. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollersUnreachable=1 + +### Option: StartTrappers +# Number of pre-forked instances of trappers. +# Trappers accept incoming connections from Zabbix sender, active agents and active proxies. +# At least one trapper process must be running to display server availability and view queue +# in the frontend. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartTrappers=5 + +### Option: StartPingers +# Number of pre-forked instances of ICMP pingers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPingers=1 + +### Option: StartDiscoverers +# Number of pre-forked instances of discoverers. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartDiscoverers=1 + +### Option: StartHTTPPollers +# Number of pre-forked instances of HTTP pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartHTTPPollers=1 + +### Option: StartTimers +# Number of pre-forked instances of timers. +# Timers process time-based trigger functions and maintenance periods. +# Only the first timer process handles the maintenance periods. +# +# Mandatory: no +# Range: 1-1000 +# Default: +# StartTimers=1 + +### Option: JavaGateway +# IP address (or hostname) of Zabbix Java gateway. +# Only required if Java pollers are started. +# +# Mandatory: no +# Default: +# JavaGateway= + +### Option: JavaGatewayPort +# Port that Zabbix Java gateway listens on. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# JavaGatewayPort=10052 + +### Option: StartJavaPollers +# Number of pre-forked instances of Java pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartJavaPollers=0 + +### Option: StartVMwareCollectors +# Number of pre-forked vmware collector instances. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartVMwareCollectors=0 + +### Option: VMwareFrequency +# How often Zabbix will connect to VMware service to obtain a new data. +# +# Mandatory: no +# Range: 10-86400 +# Default: +# VMwareFrequency=60 + +### Option: VMwareCacheSize +# Size of VMware cache, in bytes. +# Shared memory size for storing VMware data. +# Only used if VMware collectors are started. +# +# Mandatory: no +# Range: 256K-2G +# Default: +# VMwareCacheSize=8M + +### Option: SNMPTrapperFile +# Temporary file used for passing data from SNMP trap daemon to the server. +# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. +# +# Mandatory: no +# Default: +# SNMPTrapperFile=/tmp/zabbix_traps.tmp + +### Option: StartSNMPTrapper +# If 1, SNMP trapper process is started. +# +# Mandatory: no +# Range: 0-1 +# Default: +# StartSNMPTrapper=0 + +### Option: ListenIP +# List of comma delimited IP addresses that the trapper should listen on. +# Trapper will listen on all network interfaces if this parameter is missing. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +# ListenIP=127.0.0.1 + +### Option: HousekeepingFrequency +# How often Zabbix will perform housekeeping procedure (in hours). +# Housekeeping is removing unnecessary information from history, alert, alarm, and other tables. +# To prevent housekeeper from being overloaded (for example, when history and trend periods +# are greatly reduced), no more than 4xHousekeepingFrequency hours of outdated history are +# deleted in one housekeeping cycle, for each item. +# To lower load on server startup housekeeping is postponed for 30 minutes after server start. +# +# Mandatory: no +# Range: 1-24 +# Default: +# HousekeepingFrequency=1 + +### Option: MaxHousekeeperDelete +# The table "housekeeper" contains "tasks" for housekeeping procedure in the format: +# [housekeeperid], [tablename], [field], [value]. +# No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value]) +# will be deleted per one task in one housekeeping cycle. +# SQLite3 does not use this parameter, deletes all corresponding rows without a limit. +# If set to 0 then no limit is used at all. In this case you must know what you are doing! +# +# Mandatory: no +# Range: 0-1000000 +# Default: +# MaxHousekeeperDelete=500 + +### Option: SenderFrequency +# How often Zabbix will try to send unsent alerts (in seconds). +# +# Mandatory: no +# Range: 5-3600 +# Default: +# SenderFrequency=30 + +### Option: CacheSize +# Size of configuration cache, in bytes. +# Shared memory size for storing host, item and trigger data. +# +# Mandatory: no +# Range: 128K-8G +# Default: +# CacheSize=8M + +### Option: CacheUpdateFrequency +# How often Zabbix will perform update of configuration cache, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# CacheUpdateFrequency=60 + +### Option: StartDBSyncers +# Number of pre-forked instances of DB Syncers +# +# Mandatory: no +# Range: 1-100 +# Default: +# StartDBSyncers=4 + +### Option: HistoryCacheSize +# Size of history cache, in bytes. +# Shared memory size for storing history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryCacheSize=8M + +### Option: TrendCacheSize +# Size of trend cache, in bytes. +# Shared memory size for storing trends data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# TrendCacheSize=4M + +### Option: HistoryTextCacheSize +# Size of text history cache, in bytes. +# Shared memory size for storing character, text or log history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryTextCacheSize=16M + +### Option: ValueCacheSize +# Size of history value cache, in bytes. +# Shared memory size for caching item history data requests. +# Setting to 0 disables value cache. +# +# Mandatory: no +# Range: 0,128K-64G +# Default: +# ValueCacheSize=8M + +### Option: Timeout +# Specifies how long we wait for agent, SNMP device or external check (in seconds). +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: TrapperTimeout +# Specifies how many seconds trapper may spend processing new data. +# +# Mandatory: no +# Range: 1-300 +# Default: +# TrapperTimeout=300 + +### Option: UnreachablePeriod +# After how many seconds of unreachability treat a host as unavailable. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachablePeriod=45 + +### Option: UnavailableDelay +# How often host is checked for availability during the unavailability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnavailableDelay=60 + +### Option: UnreachableDelay +# How often host is checked for availability during the unreachability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachableDelay=15 + +### Option: AlertScriptsPath +# Full path to location of custom alert scripts. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# AlertScriptsPath=${datadir}/zabbix/alertscripts + +### Option: ExternalScripts +# Full path to location of external scripts. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# ExternalScripts=${datadir}/zabbix/externalscripts + +### Option: FpingLocation +# Location of fping. +# Make sure that fping binary has root ownership and SUID flag set. +# +# Mandatory: no +# Default: +# FpingLocation=/usr/sbin/fping + +### Option: Fping6Location +# Location of fping6. +# Make sure that fping6 binary has root ownership and SUID flag set. +# Make empty if your fping utility is capable to process IPv6 addresses. +# +# Mandatory: no +# Default: +# Fping6Location=/usr/sbin/fping6 + +### Option: SSHKeyLocation +# Location of public and private keys for SSH checks and actions. +# +# Mandatory: no +# Default: +# SSHKeyLocation= + +### Option: LogSlowQueries +# How long a database query may take before being logged (in milliseconds). +# Only works if DebugLevel set to 3 or 4. +# 0 - don't log slow queries. +# +# Mandatory: no +# Range: 1-3600000 +# Default: +# LogSlowQueries=0 + +### Option: TmpDir +# Temporary directory. +# +# Mandatory: no +# Default: +# TmpDir=/tmp + +### Option: StartProxyPollers +# Number of pre-forked instances of pollers for passive proxies. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartProxyPollers=1 + +### Option: ProxyConfigFrequency +# How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds. +# This parameter is used only for proxies in the passive mode. +# +# Mandatory: no +# Range: 1-3600*24*7 +# Default: +# ProxyConfigFrequency=3600 + +### Option: ProxyDataFrequency +# How often Zabbix Server requests history data from a Zabbix Proxy in seconds. +# This parameter is used only for proxies in the passive mode. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# ProxyDataFrequency=1 + +### Option: AllowRoot +# Allow the server to run as 'root'. If disabled and the server is started by 'root', the server +# will try to switch to the user specified by the User configuration option instead. +# Has no effect if started under a regular user. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Default: +# AllowRoot=0 + +### Option: User +# Drop privileges to a specific, existing user on the system. +# Only has effect if run as 'root' and AllowRoot is disabled. +# +# Mandatory: no +# Default: +# User=zabbix + +### Option: Include +# You may include individual files or all files in a directory in the configuration file. +# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/usr/local/etc/zabbix_server.general.conf +# Include=/usr/local/etc/zabbix_server.conf.d/ +# Include=/usr/local/etc/zabbix_server.conf.d/*.conf + +### Option: SSLCertLocation +# Location of SSL client certificates. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLCertLocation=${datadir}/zabbix/ssl/certs + +### Option: SSLKeyLocation +# Location of private keys for SSL client certificates. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLKeyLocation=${datadir}/zabbix/ssl/keys + +### Option: SSLCALocation +# Override the location of certificate authority (CA) files for SSL server certificate verification. +# If not set, system-wide directory will be used. +# This parameter is used only in web monitoring. +# +# Mandatory: no +# Default: +# SSLCALocation= + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of server modules. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# LoadModulePath=${libdir}/modules + +### Option: LoadModule +# Module to load at server startup. Modules are used to extend functionality of the server. +# Format: LoadModule= +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= diff --git a/net-analyzer/zabbix/zabbix-2.4.1.ebuild b/net-analyzer/zabbix/zabbix-2.4.1.ebuild index cedb035..3ab9a91 100644 --- a/net-analyzer/zabbix/zabbix-2.4.1.ebuild +++ b/net-analyzer/zabbix/zabbix-2.4.1.ebuild @@ -250,8 +250,8 @@ src_install() { if use server; then insinto /etc/zabbix - doins "${FILESDIR}/2.2"/zabbix_server.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-server + doins "${FILESDIR}/2.4"/zabbix_server.conf + doinitd "${FILESDIR}/2.4"/init.d/zabbix-server dosbin src/zabbix_server/zabbix_server fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf fperms 0640 /etc/zabbix/zabbix_server.conf @@ -263,12 +263,12 @@ src_install() { if use proxy; then doinitd \ - "${FILESDIR}/2.2"/init.d/zabbix-proxy + "${FILESDIR}/2.4"/init.d/zabbix-proxy dosbin \ src/zabbix_proxy/zabbix_proxy insinto /etc/zabbix doins \ - "${FILESDIR}/2.2"/zabbix_proxy.conf + "${FILESDIR}/2.4"/zabbix_proxy.conf dodir /usr/share/zabbix /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ systemd_dounit "${FILESDIR}/zabbix-proxy.service" @@ -278,9 +278,9 @@ src_install() { if use agent; then insinto /etc/zabbix doins \ - "${FILESDIR}/2.2"/zabbix_agent.conf \ - "${FILESDIR}/2.2"/zabbix_agentd.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd + "${FILESDIR}/2.4"/zabbix_agent.conf \ + "${FILESDIR}/2.4"/zabbix_agentd.conf + doinitd "${FILESDIR}/2.4"/init.d/zabbix-agentd dosbin \ src/zabbix_agent/zabbix_agent \ src/zabbix_agent/zabbix_agentd From 92e2c06db7f36897ab7d5c6733a5a5604c7429f5 Mon Sep 17 00:00:00 2001 From: Matthias Drobny Date: Wed, 15 Oct 2014 16:51:30 +0200 Subject: [PATCH 3/8] =?UTF-8?q?Manifest=C3=A4nderung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- net-analyzer/zabbix/Manifest | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 9c87700..c589cc3 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -1,4 +1,12 @@ +AUX 2.4/init.d/zabbix-agentd 730 SHA256 f60d80c937ef3a2fa0092a7948dbb644ab968a7d66ab0e44f1849b2e7ac35ed6 SHA512 523053ec80c43e3491a39478e8b4aaf8da17264fdcfb7d9dfecc03007f43266ba9d23c87119214de3d76834f9c664bd6f9c157b14fead040ead1760be30df7e8 WHIRLPOOL 6ac58565de163c5dda1837ecbac160a4ae484d718cd0797eff2a0fbe178ac285cfa4c984baf3fd5074fdd504a85f39a04c4fcfdb7c6202876d47f33eebd7d290 +AUX 2.4/init.d/zabbix-proxy 707 SHA256 123cad5312edc8060a8223d2400e77dbf5892762bc73284e4f6c010c3941e747 SHA512 28b4fea607b619357ac98d2a38929d1620d2db546c6024bd0c3f4c27693b83d074d2281128bb9db395c54f4e4bd14249b31683174dab605ee0dbee347691818f WHIRLPOOL 7e8077dbe3313ab4b8d216909f18acf2932e3c9d492b58d9da9340796e250d5052f76655ba59c360feaa2542aa01e0b902dca5f3f091d517cb3a2039ca1228ca +AUX 2.4/init.d/zabbix-server 719 SHA256 2a072cbc510e013dd99d8c428c81e19953765dfc9ba6ab0c6a847bf68ae7b8d5 SHA512 127c0ba1f378ad5dbe5761713bd12dddbe99da9434a0b9e2aa34f1c05b7f556178b359f090bd1f8f888eeaf4d7886d475f30a82c48a6122f26e42aa3dc7b519a WHIRLPOOL ddeb9b038f645da0bf72562a92caec96fe0327ed58268ae0f0388d12c1b773ad0811a1db8effd34f3047f86d4ce837f40fe6ed2597e6571de5f03e41a1f3aa66 +AUX 2.4/zabbix_agent.conf 2537 SHA256 a9e53ce0cf9c037996257ada36beb6dfeb92b9c070162c690b48f3e9bdd0c155 SHA512 be3b8623ce2cae49287fc800101f2ca390b8512e0f41ed7a029a5936b77f1f25a70c097d92e158dc7f09159a030a0bbd49702e5616ce94bdf99e3fd04c96ef54 WHIRLPOOL 863edc3a5423c9a3f1beacfc62e0f5016705999e4ffd444364864581b1b0d042fadae1fdd96d0873b008d6a5174f8786e0dd0958d218fff663682fd40f3e526f +AUX 2.4/zabbix_agentd.conf 7797 SHA256 4b7622c5615a140c59a9a70ba8355f26c1502fad96a6f38a258a2849ab282fd1 SHA512 75dd9ca7b4801fb5b2ad58832caae91e2fbcc536b6484dea4bec18b1054b94a08830781f23fd214775e83b393c4ddaebea3e744aa01b86e47cf37428cea3ba0b WHIRLPOOL 1ebd51227aa2a6e361560699431657a2c103b4e24aebae6024cfde4dfe3ce2720ba14f9932820234940fd7a4cb7fbe6fe34a6f4277bd87524fa6fc269e815a2b +AUX 2.4/zabbix_agentd.win.conf 7251 SHA256 f1ed583c909b821386fba11d854087c0f900c0b77b17d170c6b4cc71a7bacc0c SHA512 a215fab803eafd6ec15bd73087f38aa0c94b7a05e222647f417e0404f77222151749a1583fbbcb63b8a7a1b63a086a33f11724c4ccdc7c20863513a53fe7f5ac WHIRLPOOL a8552eecfd7289ebb7907ed9e6f8bf3658ceb24b6ccbdab08f43201dd207f7f990e5fb639f1890d71492f8eb22e5fc4b6290453955aeab203bdda86e1af238c5 +AUX 2.4/zabbix_proxy.conf 12693 SHA256 c5783c7f81bd8c0e620dfbcaf207a268b81454e4ffef28dd9ee71a772f025a56 SHA512 8764e2dfe950ce1b5b237ac848ca8dacd4eb9f7baf8f868527c8b599dd0dbfdd381e26bb012e9f350e3c211611edc92e4685b44876a77fb5fe86a501713cc8eb WHIRLPOOL b7431df3624c97983d573b5dfc56be1de76e0f093310a42f46ac822218918ae3223b534688c4bff67f7e98f53416a8def5eea083e56a67f1908d0b3e30802cc0 +AUX 2.4/zabbix_server.conf 13025 SHA256 3bbfdd3a2efb4db8d6fc7790ca9be1be47581a949d4ab437f1c809a7c362991d SHA512 2afd8d9d99d459ff41913e87a46eb29e191eab93a9b4a5b2e7822508c08f75e480b7306a5995981c4ed87fc2b3988f471680d28542d9b2ce3b4ce6cdb18b630a WHIRLPOOL 4e1e3baf7582c0ebcb13161485d8210e2db00a7cb341a2cf23ae72f0d86accb4820619be27e14e8b5980c5f1c8a13559dfdbc08fb97c880ee480db95fe146237 DIST zabbix-2.4.1.tar.gz 14730972 SHA256 e47b328c2babcc7c37b27c96732b5f6ac28a935901acf8a3d340887ba64bece4 SHA512 8cf19262503ade91188cc6a9653fd2f13c966cc2638b9c36f1ecfb989707fc991cfa3bfa487b0c8a230caa6e344105a4494fd3981d8b09c07048842369e71dc2 WHIRLPOOL 5907ef1eb71c175879e93be7151a1c313a5a90d05ffdd1a2189beb22133fa08d24fb72749e0e9a13fa7a6a5b3eb0470d0331e05cd15e2f77ffdb616d5aaf24ec -EBUILD zabbix-2.4.1.ebuild 10177 SHA256 477f77001c7016053d06c7351c5e6ad4c379b446ae8324df2faee6597b4bf537 SHA512 9de8e70b19602f37570ead0f64e170899d4545f2a14b371e0c9041ea14d210ae6a9e2e34ce8f42ec4b44826ec81163119dc9cd4bfb01009baa49e3d903a0ac8e WHIRLPOOL beea7f7f1374299a1804ba41de2db2cbcfa97878b57d3345f67ae680a1f54d48bf287e7d6914737f59bee1fbe1501582f1bea4f2f784077757577e9d348ef423 +EBUILD zabbix-2.4.1.ebuild 10177 SHA256 fc15fa7334812230ff4739f633e4553de8b219fc1b7ae16fa780f796276b1606 SHA512 35367070a01ef0b5bbb94bba1ad85c2a6fd41e759a3ed431d12ea8742ae2a572781f1704c61db0d7e697abb45bf50c534e797f5222ec60e16540893954b37309 WHIRLPOOL ed979699c41905e5aae733afc7cdb4722f94cb5561ebc53fca8d30e57af7ff88a4383e75b3138c199a193022d028ef3d23d0b04b69011fbac034d4d395701e08 MISC ChangeLog 38192 SHA256 ab3ae5d2bbc07db9b986e109ab9f17e888ea96246bfdd091063f96c760546ec9 SHA512 73ec2d31906aebf07a05edf0184dfaa964ed41249f7e05ec093c137ea1151cc44248591216c55b6360e7fdebfc1627d58918648b6408c96bf1d9f6bca8e5978b WHIRLPOOL 645a94821eefa0cffcf58208f7eebeac6491030dca8bb7ddd6e6bdbc6681f3299e5259efba86856d12de92bf014f91cfaefc0f249ad2d21537a175c56a3b959e MISC metadata.xml 1221 SHA256 94d1841cf3efb9a709dbc9ee160a29c394a1c0f5af5069fe1466f9f08796c72d SHA512 3d3ed8e75fcd9f521402a9734d5bd19c163a7a5d33cef3b20b6e476416fc352a91a62782ecc0ed032efbafd5f07f6ac08e28a88fb766095a1bba146f8f50b5e5 WHIRLPOOL ae2d69cab99c364721ca2e806fc5e02d1dbe72ad48bea43b4d1a0fd49c00cc2b94ea6ea85f4f5a9ff90522a90ade17fe816fe85ca7a16e755d02239d4426da92 From 23653a0ae345896f4a6b3038c2605a76d4df9498 Mon Sep 17 00:00:00 2001 From: Matthias Drobny Date: Wed, 15 Oct 2014 17:07:46 +0200 Subject: [PATCH 4/8] =?UTF-8?q?Installationsdateien=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- net-analyzer/zabbix/files/zabbix-agentd.service | 14 ++++++++++++++ net-analyzer/zabbix/files/zabbix-agentd.tmpfiles | 1 + net-analyzer/zabbix/files/zabbix-proxy.service | 14 ++++++++++++++ net-analyzer/zabbix/files/zabbix-proxy.tmpfiles | 1 + net-analyzer/zabbix/files/zabbix-server.service | 14 ++++++++++++++ net-analyzer/zabbix/files/zabbix-server.tmpfiles | 1 + 6 files changed, 45 insertions(+) create mode 100644 net-analyzer/zabbix/files/zabbix-agentd.service create mode 100644 net-analyzer/zabbix/files/zabbix-agentd.tmpfiles create mode 100644 net-analyzer/zabbix/files/zabbix-proxy.service create mode 100644 net-analyzer/zabbix/files/zabbix-proxy.tmpfiles create mode 100644 net-analyzer/zabbix/files/zabbix-server.service create mode 100644 net-analyzer/zabbix/files/zabbix-server.tmpfiles diff --git a/net-analyzer/zabbix/files/zabbix-agentd.service b/net-analyzer/zabbix/files/zabbix-agentd.service new file mode 100644 index 0000000..8485d06 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-agentd.service @@ -0,0 +1,14 @@ +[Unit] +Description=Zabbix agent daemon +After=network.target + +[Service] +Type=forking +User=zabbix +Group=zabbix +ExecStart=/usr/sbin/zabbix_agentd -c /etc/zabbix/zabbix_agentd.conf +PIDFile=/run/zabbix/zabbix_agentd.pid + +[Install] +WantedBy=multi-user.target + diff --git a/net-analyzer/zabbix/files/zabbix-agentd.tmpfiles b/net-analyzer/zabbix/files/zabbix-agentd.tmpfiles new file mode 100644 index 0000000..56471bb --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-agentd.tmpfiles @@ -0,0 +1 @@ +d /run/zabbix 0755 zabbix zabbix - diff --git a/net-analyzer/zabbix/files/zabbix-proxy.service b/net-analyzer/zabbix/files/zabbix-proxy.service new file mode 100644 index 0000000..85ecd79 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-proxy.service @@ -0,0 +1,14 @@ +[Unit] +Description=Zabbix proxy +After=network.target + +[Service] +Type=forking +User=zabbix +Group=zabbix +ExecStart=/usr/sbin/zabbix_proxy -c /etc/zabbix/zabbix_proxy.conf +PIDFile=/run/zabbix/zabbix_proxy.pid + +[Install] +WantedBy=multi-user.target + diff --git a/net-analyzer/zabbix/files/zabbix-proxy.tmpfiles b/net-analyzer/zabbix/files/zabbix-proxy.tmpfiles new file mode 100644 index 0000000..56471bb --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-proxy.tmpfiles @@ -0,0 +1 @@ +d /run/zabbix 0755 zabbix zabbix - diff --git a/net-analyzer/zabbix/files/zabbix-server.service b/net-analyzer/zabbix/files/zabbix-server.service new file mode 100644 index 0000000..3ea9733 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-server.service @@ -0,0 +1,14 @@ +[Unit] +Description=Zabbix server +After=syslog.target network.target postgresql.service + +[Service] +Type=forking +User=zabbix +Group=zabbix +ExecStart=/usr/sbin/zabbix_server -c /etc/zabbix/zabbix_server.conf +PIDFile=/run/zabbix/zabbix_server.pid + +[Install] +WantedBy=multi-user.target + diff --git a/net-analyzer/zabbix/files/zabbix-server.tmpfiles b/net-analyzer/zabbix/files/zabbix-server.tmpfiles new file mode 100644 index 0000000..56471bb --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-server.tmpfiles @@ -0,0 +1 @@ +d /run/zabbix 0755 zabbix zabbix - From 0c2a8deb947e266c75dca715923adf416c7968ad Mon Sep 17 00:00:00 2001 From: Matthias Drobny Date: Thu, 16 Oct 2014 09:27:45 +0200 Subject: [PATCH 5/8] Service-Dateien und Manifest --- net-analyzer/zabbix/Manifest | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index c589cc3..c50b986 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -6,6 +6,12 @@ AUX 2.4/zabbix_agentd.conf 7797 SHA256 4b7622c5615a140c59a9a70ba8355f26c1502fad9 AUX 2.4/zabbix_agentd.win.conf 7251 SHA256 f1ed583c909b821386fba11d854087c0f900c0b77b17d170c6b4cc71a7bacc0c SHA512 a215fab803eafd6ec15bd73087f38aa0c94b7a05e222647f417e0404f77222151749a1583fbbcb63b8a7a1b63a086a33f11724c4ccdc7c20863513a53fe7f5ac WHIRLPOOL a8552eecfd7289ebb7907ed9e6f8bf3658ceb24b6ccbdab08f43201dd207f7f990e5fb639f1890d71492f8eb22e5fc4b6290453955aeab203bdda86e1af238c5 AUX 2.4/zabbix_proxy.conf 12693 SHA256 c5783c7f81bd8c0e620dfbcaf207a268b81454e4ffef28dd9ee71a772f025a56 SHA512 8764e2dfe950ce1b5b237ac848ca8dacd4eb9f7baf8f868527c8b599dd0dbfdd381e26bb012e9f350e3c211611edc92e4685b44876a77fb5fe86a501713cc8eb WHIRLPOOL b7431df3624c97983d573b5dfc56be1de76e0f093310a42f46ac822218918ae3223b534688c4bff67f7e98f53416a8def5eea083e56a67f1908d0b3e30802cc0 AUX 2.4/zabbix_server.conf 13025 SHA256 3bbfdd3a2efb4db8d6fc7790ca9be1be47581a949d4ab437f1c809a7c362991d SHA512 2afd8d9d99d459ff41913e87a46eb29e191eab93a9b4a5b2e7822508c08f75e480b7306a5995981c4ed87fc2b3988f471680d28542d9b2ce3b4ce6cdb18b630a WHIRLPOOL 4e1e3baf7582c0ebcb13161485d8210e2db00a7cb341a2cf23ae72f0d86accb4820619be27e14e8b5980c5f1c8a13559dfdbc08fb97c880ee480db95fe146237 +AUX zabbix-agentd.service 254 SHA256 0cb3dce6c208d1bdcc9f258bf04904932a30e4a3ab6e45aa6b3a687fb807d3e3 SHA512 f740ef1f6f698eab0ebe894ba726b7a4b35379974c3f5dda26c43c6360f0b8f86f2846c085befe485ced6345fd39e67fe221ce9f08955896e4ccb5561e124c01 WHIRLPOOL fd3421c1197652b47393df3e6f25d2fbff0e7cf0419b518c6f3a23a0ef31f42123694826971253affb07daabdb4e70eb983d7fc560da80c8d05f0189a9fe8af5 +AUX zabbix-agentd.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39 +AUX zabbix-proxy.service 244 SHA256 e0b65f25da5d4db20b50a62a50802f6692181365d43a09e59af906f78a1ccfef SHA512 450bc0ccd110fb012c31e43fc1dd92604255f7577dabce49e67b36f80ef73a1ddfd967e9ca7ccd37dc13e5ac50e0c45bf924999f4e3c7b13ddd284f89f076bad WHIRLPOOL 4b16647b07b30e59d2baa4b53a767154cf06d181813fda92df03f1fa11737abb4070f065f743fde34fa45a2dae614131420c07d61bb3390e1a696625967e09d2 +AUX zabbix-proxy.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39 +AUX zabbix-server.service 281 SHA256 53465d624fc5cd4d00586119234c2d3d763b63a2721f9410392cb77f73db4a74 SHA512 b002e8efdc58300fc06ed1e1028f64d525dfaff52d74e661dbb4da3750b785d817d2bdff96f4ea3a28545fda4e37df962ec7a28b70868cc4b50b63ea27b088ff WHIRLPOOL caf2ef91caf33b517623e5c4e81bf635886d5199ec1f33389dee33cbb2d13c78d54911daac2d1af317d0b2b32d361424a961d7530a690d30f3d0089fb96e4808 +AUX zabbix-server.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39 DIST zabbix-2.4.1.tar.gz 14730972 SHA256 e47b328c2babcc7c37b27c96732b5f6ac28a935901acf8a3d340887ba64bece4 SHA512 8cf19262503ade91188cc6a9653fd2f13c966cc2638b9c36f1ecfb989707fc991cfa3bfa487b0c8a230caa6e344105a4494fd3981d8b09c07048842369e71dc2 WHIRLPOOL 5907ef1eb71c175879e93be7151a1c313a5a90d05ffdd1a2189beb22133fa08d24fb72749e0e9a13fa7a6a5b3eb0470d0331e05cd15e2f77ffdb616d5aaf24ec EBUILD zabbix-2.4.1.ebuild 10177 SHA256 fc15fa7334812230ff4739f633e4553de8b219fc1b7ae16fa780f796276b1606 SHA512 35367070a01ef0b5bbb94bba1ad85c2a6fd41e759a3ed431d12ea8742ae2a572781f1704c61db0d7e697abb45bf50c534e797f5222ec60e16540893954b37309 WHIRLPOOL ed979699c41905e5aae733afc7cdb4722f94cb5561ebc53fca8d30e57af7ff88a4383e75b3138c199a193022d028ef3d23d0b04b69011fbac034d4d395701e08 MISC ChangeLog 38192 SHA256 ab3ae5d2bbc07db9b986e109ab9f17e888ea96246bfdd091063f96c760546ec9 SHA512 73ec2d31906aebf07a05edf0184dfaa964ed41249f7e05ec093c137ea1151cc44248591216c55b6360e7fdebfc1627d58918648b6408c96bf1d9f6bca8e5978b WHIRLPOOL 645a94821eefa0cffcf58208f7eebeac6491030dca8bb7ddd6e6bdbc6681f3299e5259efba86856d12de92bf014f91cfaefc0f249ad2d21537a175c56a3b959e From 9fa94955badab5eaa9ad5c59b976b4ec58314dfc Mon Sep 17 00:00:00 2001 From: Matthias Drobny Date: Thu, 16 Oct 2014 09:39:39 +0200 Subject: [PATCH 6/8] weitere Dateien --- .../zabbix/files/1.4.6/init.d/zabbix-agentd | 22 + .../zabbix/files/1.4.6/init.d/zabbix-server | 21 + .../zabbix/files/1.4.6/postinstall-en.txt | 8 + .../zabbix/files/1.4.6/zabbix_agent.conf | 25 + .../zabbix/files/1.4.6/zabbix_agentd.conf | 70 +++ .../zabbix/files/1.4.6/zabbix_server.conf | 98 ++++ .../zabbix/files/1.6.5/init.d/zabbix-agentd | 22 + .../zabbix/files/1.6.5/init.d/zabbix-server | 21 + .../zabbix/files/1.6.5/postinstall-en.txt | 8 + .../zabbix/files/1.6.5/zabbix_agent.conf | 27 + .../zabbix/files/1.6.5/zabbix_agentd.conf | 90 +++ .../zabbix/files/1.6.5/zabbix_proxy.conf | 175 ++++++ .../zabbix/files/1.6.5/zabbix_server.conf | 155 +++++ .../zabbix/files/1.6.5/zabbix_trapper.conf | 44 ++ .../zabbix/files/1.6.6/init.d/zabbix-agentd | 22 + .../zabbix/files/1.6.6/init.d/zabbix-proxy | 21 + .../zabbix/files/1.6.6/init.d/zabbix-server | 21 + .../zabbix/files/1.6.6/postinstall-en.txt | 8 + .../zabbix/files/1.6.6/zabbix_agent.conf | 27 + .../zabbix/files/1.6.6/zabbix_agentd.conf | 90 +++ .../zabbix/files/1.6.6/zabbix_proxy.conf | 175 ++++++ .../zabbix/files/1.6.6/zabbix_server.conf | 155 +++++ .../zabbix/files/1.6.6/zabbix_trapper.conf | 44 ++ .../zabbix/files/2.0/init.d/zabbix-agentd | 29 + .../zabbix/files/2.0/init.d/zabbix-proxy | 28 + .../zabbix/files/2.0/init.d/zabbix-server | 27 + .../zabbix/files/2.0/patches/zbx282.patch | 182 ++++++ .../zabbix/files/2.0/patches/zbx6097.patch | 66 +++ .../zabbix/files/2.0/patches/zbx7479.patch | 83 +++ .../zabbix/files/2.0/zabbix_proxy.conf | 463 +++++++++++++++ .../zabbix/files/2.2/init.d/zabbix-agentd | 29 + .../zabbix/files/2.2/init.d/zabbix-proxy | 28 + .../zabbix/files/2.2/init.d/zabbix-server | 27 + .../zabbix/files/2.2/patches/zbx7479.patch | 83 +++ .../zabbix/files/2.2/patches/zbx8151.patch | 53 ++ .../zabbix/files/2.2/zabbix_agent.conf | 81 +++ .../zabbix/files/2.2/zabbix_agentd.conf | 278 +++++++++ .../zabbix/files/2.2/zabbix_proxy.conf | 519 +++++++++++++++++ .../zabbix/files/2.2/zabbix_server.conf | 546 ++++++++++++++++++ .../zabbix/files/zabbix-1.8.9-as-needed.patch | 83 +++ 40 files changed, 3954 insertions(+) create mode 100644 net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd create mode 100644 net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server create mode 100644 net-analyzer/zabbix/files/1.4.6/postinstall-en.txt create mode 100644 net-analyzer/zabbix/files/1.4.6/zabbix_agent.conf create mode 100644 net-analyzer/zabbix/files/1.4.6/zabbix_agentd.conf create mode 100644 net-analyzer/zabbix/files/1.4.6/zabbix_server.conf create mode 100644 net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd create mode 100644 net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server create mode 100644 net-analyzer/zabbix/files/1.6.5/postinstall-en.txt create mode 100644 net-analyzer/zabbix/files/1.6.5/zabbix_agent.conf create mode 100644 net-analyzer/zabbix/files/1.6.5/zabbix_agentd.conf create mode 100644 net-analyzer/zabbix/files/1.6.5/zabbix_proxy.conf create mode 100644 net-analyzer/zabbix/files/1.6.5/zabbix_server.conf create mode 100644 net-analyzer/zabbix/files/1.6.5/zabbix_trapper.conf create mode 100644 net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd create mode 100644 net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy create mode 100644 net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server create mode 100644 net-analyzer/zabbix/files/1.6.6/postinstall-en.txt create mode 100644 net-analyzer/zabbix/files/1.6.6/zabbix_agent.conf create mode 100644 net-analyzer/zabbix/files/1.6.6/zabbix_agentd.conf create mode 100644 net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf create mode 100644 net-analyzer/zabbix/files/1.6.6/zabbix_server.conf create mode 100644 net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf create mode 100644 net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd create mode 100644 net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy create mode 100644 net-analyzer/zabbix/files/2.0/init.d/zabbix-server create mode 100644 net-analyzer/zabbix/files/2.0/patches/zbx282.patch create mode 100644 net-analyzer/zabbix/files/2.0/patches/zbx6097.patch create mode 100644 net-analyzer/zabbix/files/2.0/patches/zbx7479.patch create mode 100644 net-analyzer/zabbix/files/2.0/zabbix_proxy.conf create mode 100644 net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd create mode 100644 net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy create mode 100644 net-analyzer/zabbix/files/2.2/init.d/zabbix-server create mode 100644 net-analyzer/zabbix/files/2.2/patches/zbx7479.patch create mode 100644 net-analyzer/zabbix/files/2.2/patches/zbx8151.patch create mode 100644 net-analyzer/zabbix/files/2.2/zabbix_agent.conf create mode 100644 net-analyzer/zabbix/files/2.2/zabbix_agentd.conf create mode 100644 net-analyzer/zabbix/files/2.2/zabbix_proxy.conf create mode 100644 net-analyzer/zabbix/files/2.2/zabbix_server.conf create mode 100644 net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch diff --git a/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd new file mode 100644 index 0000000..d264bd7 --- /dev/null +++ b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd,v 1.2 2011/12/31 20:47:13 idl0r Exp $ + +depend() { + need net + provide zabbix-agent + use zabbix-server +} + +start() { + ebegin "Starting Zabbix agent" + start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd + eend $? +} + +stop() { + ebegin "Stopping Zabbix agent" + start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_agentd.pid + eend $? +} diff --git a/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server new file mode 100644 index 0000000..83aaf4c --- /dev/null +++ b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server,v 1.2 2011/12/31 20:47:13 idl0r Exp $ + +depend() { + need net + use mysql postgresql +} + +start() { + ebegin "Starting Zabbix server" + start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server + eend $? +} + +stop() { + ebegin "Stopping Zabbix server" + start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid + eend $? +} diff --git a/net-analyzer/zabbix/files/1.4.6/postinstall-en.txt b/net-analyzer/zabbix/files/1.4.6/postinstall-en.txt new file mode 100644 index 0000000..9d13a9f --- /dev/null +++ b/net-analyzer/zabbix/files/1.4.6/postinstall-en.txt @@ -0,0 +1,8 @@ +Please change the values of the following variables in +${MY_HTDOCSDIR}/include/db.inc.php: + + DB_TYPE + DB_SERVER + DB_DATABASE + DB_USER + DB_PASSWORD diff --git a/net-analyzer/zabbix/files/1.4.6/zabbix_agent.conf b/net-analyzer/zabbix/files/1.4.6/zabbix_agent.conf new file mode 100644 index 0000000..4299738 --- /dev/null +++ b/net-analyzer/zabbix/files/1.4.6/zabbix_agent.conf @@ -0,0 +1,25 @@ +# This is config file for zabbix_agent +# To get more information about ZABBIX, +# go http://www.zabbix.com + +# IP address of ZABBIX server +# Connections from other hosts will be denied +Server=127.0.0.1 + +# Spend no more than Timeout seconds on processing +# Must be between 1 and 30 +Timeout=3 + +####### USER-DEFINED MONITORED PARAMETERS ####### +# Format: UserParameter=, +# 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 and add -p 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/net-analyzer/zabbix/files/1.4.6/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.4.6/zabbix_agentd.conf new file mode 100644 index 0000000..e040f17 --- /dev/null +++ b/net-analyzer/zabbix/files/1.4.6/zabbix_agentd.conf @@ -0,0 +1,70 @@ +# 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 (default) +# 4 - 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=, +# 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 and add -p 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/net-analyzer/zabbix/files/1.4.6/zabbix_server.conf b/net-analyzer/zabbix/files/1.4.6/zabbix_server.conf new file mode 100644 index 0000000..12490f8 --- /dev/null +++ b/net-analyzer/zabbix/files/1.4.6/zabbix_server.conf @@ -0,0 +1,98 @@ +# This is config file for ZABBIX server process +# To get more information about ZABBIX, +# go http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +# This defines which server this is. +# Default value 1 +# This parameter must be between 1 and 255 +Server=1 + +# Number of pre-forked instances of pollers +# Default value is 6 +# This parameter must be between 6 and 255 +StartPollers=6 + +# Number of pre-forked instances of trappers +# Default value is 5 +# This parameter must be between 2 and 255 +StartTrappers=5 + +# Listen interface for trapper. Trapper will listen all network interfaces +# if this parameter is missing. +ListenIP=127.0.0.1 + +# Listen port for trapping. Default port number is 10051. This parameter +# must be between 1024 and 32767 +ListenPort=10051 + +# 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 (in sec) +# Must be between 1 and 30 +Timeout=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 + +#Location for custom alert scripts +AlertScriptsPath=/var/lib/zabbix/scripts + +#Location of 'fping. Default is /usr/sbin/fping +FpingLocation=/usr/sbin/fping + +# Frequency of ICMP pings. Defauls is 30 second. +PingerFrequency=30 + +# 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 using Unix socket? +#DBSocket=/var/run/mysqld/mysqld.sock diff --git a/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd new file mode 100644 index 0000000..1e8e459 --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd,v 1.2 2011/12/31 20:47:13 idl0r Exp $ + +depend() { + need net + provide zabbix-agent + use zabbix-server +} + +start() { + ebegin "Starting Zabbix agent" + start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd + eend $? +} + +stop() { + ebegin "Stopping Zabbix agent" + start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_agentd.pid + eend $? +} diff --git a/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server b/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server new file mode 100644 index 0000000..277132e --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server,v 1.2 2011/12/31 20:47:13 idl0r Exp $ + +depend() { + need net + use mysql postgresql +} + +start() { + ebegin "Starting Zabbix server" + start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server + eend $? +} + +stop() { + ebegin "Stopping Zabbix server" + start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid + eend $? +} diff --git a/net-analyzer/zabbix/files/1.6.5/postinstall-en.txt b/net-analyzer/zabbix/files/1.6.5/postinstall-en.txt new file mode 100644 index 0000000..9d13a9f --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.5/postinstall-en.txt @@ -0,0 +1,8 @@ +Please change the values of the following variables in +${MY_HTDOCSDIR}/include/db.inc.php: + + DB_TYPE + DB_SERVER + DB_DATABASE + DB_USER + DB_PASSWORD diff --git a/net-analyzer/zabbix/files/1.6.5/zabbix_agent.conf b/net-analyzer/zabbix/files/1.6.5/zabbix_agent.conf new file mode 100644 index 0000000..dfa5c1b --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.5/zabbix_agent.conf @@ -0,0 +1,27 @@ +# This is config file for zabbix_agent +# To get more information about ZABBIX, +# go http://www.zabbix.com + +# IP address of ZABBIX server +# Connections from other hosts will be denied + +Server=127.0.0.1 + +# Spend no more than Timeout seconds on processing +# Must be between 1 and 30 + +Timeout=3 + +####### USER-DEFINED MONITORED PARAMETERS ####### +# Format: UserParameter=, +# 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 and add -p 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/net-analyzer/zabbix/files/1.6.5/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.6.5/zabbix_agentd.conf new file mode 100644 index 0000000..44ce9d8 --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.5/zabbix_agentd.conf @@ -0,0 +1,90 @@ +# 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=ZABBIX Server + +# Listen port. Default is 10050 + +#ListenPort=10050 + +# IP address to bind agent +# If missing, bind to all available IPs + +#ListenIP=127.0.0.1 + +# Source IP address for outgouing connections +#SourceIP= + +# 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 (default) +# 4 - 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=/tmp/zabbix_agentd.log + +# Maximum size of log file in MB. Set to 0 to disable automatic log rotation. +#LogFileSize=1 + +# Spend no more than Timeout seconds on processing +# Must be between 1 and 30 + +Timeout=3 + +####### USER-DEFINED MONITORED PARAMETERS ####### +# Format: UserParameter=, +# 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 and add -p 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/net-analyzer/zabbix/files/1.6.5/zabbix_proxy.conf b/net-analyzer/zabbix/files/1.6.5/zabbix_proxy.conf new file mode 100644 index 0000000..a09a7b6 --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.5/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/tmp/zabbix_proxy.pid + +# Name of log file +# If not set, syslog is used +LogFile=/tmp/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= + +# Connect to MySQL using Unix socket? + +#DBSocket=/tmp/mysql.sock diff --git a/net-analyzer/zabbix/files/1.6.5/zabbix_server.conf b/net-analyzer/zabbix/files/1.6.5/zabbix_server.conf new file mode 100644 index 0000000..2821ed2 --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.5/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=/tmp/zabbix_server.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=zabbix + +# Database user + +DBUser=root + +# Database password +# Comment this line if no password used + +#DBPassword= + +# Connect to MySQL using Unix socket? + +#DBSocket=/tmp/mysql.sock diff --git a/net-analyzer/zabbix/files/1.6.5/zabbix_trapper.conf b/net-analyzer/zabbix/files/1.6.5/zabbix_trapper.conf new file mode 100644 index 0000000..2022295 --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.5/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=/tmp/zabbix_trapper.log + +# Database host name +# Default is localhost + +#DBHost=localhost + +# Database name + +DBName=zabbix + +# Database user + +DBUser=root + +# Database password +# Comment this line if no password used + +#DBPassword= + +# Connect to MySQL usig Unix socket? + +#DBSocket=/tmp/mysql.sock diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd new file mode 100644 index 0000000..afd0a35 --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2011 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.3 2011/12/31 20:47:13 idl0r Exp $ + +depend() { + need net + provide zabbix-agent + use zabbix-server +} + +start() { + ebegin "Starting Zabbix agent" + start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd + eend $? +} + +stop() { + ebegin "Stopping Zabbix agent" + start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_agentd.pid + eend $? +} diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy new file mode 100644 index 0000000..e982406 --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2011 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.3 2011/12/31 20:47:13 idl0r Exp $ + +depend() { + need net + #use mysql postgresql +} + +start() { + ebegin "Starting Zabbix proxy" + start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy + eend $? +} + +stop() { + ebegin "Stopping Zabbix proxy" + start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_proxy.pid + eend $? +} diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server new file mode 100644 index 0000000..d5d616e --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2011 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.3 2011/12/31 20:47:13 idl0r Exp $ + +depend() { + need net + use mysql postgresql +} + +start() { + ebegin "Starting Zabbix server" + start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server + eend $? +} + +stop() { + ebegin "Stopping Zabbix server" + start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid + eend $? +} diff --git a/net-analyzer/zabbix/files/1.6.6/postinstall-en.txt b/net-analyzer/zabbix/files/1.6.6/postinstall-en.txt new file mode 100644 index 0000000..9d13a9f --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.6/postinstall-en.txt @@ -0,0 +1,8 @@ +Please change the values of the following variables in +${MY_HTDOCSDIR}/include/db.inc.php: + + DB_TYPE + DB_SERVER + DB_DATABASE + DB_USER + DB_PASSWORD diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_agent.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_agent.conf new file mode 100644 index 0000000..dfa5c1b --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.6/zabbix_agent.conf @@ -0,0 +1,27 @@ +# This is config file for zabbix_agent +# To get more information about ZABBIX, +# go http://www.zabbix.com + +# IP address of ZABBIX server +# Connections from other hosts will be denied + +Server=127.0.0.1 + +# Spend no more than Timeout seconds on processing +# Must be between 1 and 30 + +Timeout=3 + +####### USER-DEFINED MONITORED PARAMETERS ####### +# Format: UserParameter=, +# 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 and add -p 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/net-analyzer/zabbix/files/1.6.6/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_agentd.conf new file mode 100644 index 0000000..aac55ee --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.6/zabbix_agentd.conf @@ -0,0 +1,90 @@ +# 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=ZABBIX Server + +# Listen port. Default is 10050 + +#ListenPort=10050 + +# IP address to bind agent +# If missing, bind to all available IPs + +#ListenIP=127.0.0.1 + +# Source IP address for outgouing connections +#SourceIP= + +# 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 (default) +# 4 - 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 + +# Maximum size of log file in MB. Set to 0 to disable automatic log rotation. +#LogFileSize=1 + +# Spend no more than Timeout seconds on processing +# Must be between 1 and 30 + +Timeout=3 + +####### USER-DEFINED MONITORED PARAMETERS ####### +# Format: UserParameter=, +# 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 and add -p 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/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf new file mode 100644 index 0000000..e0380d4 --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.6/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= + +# Connect to MySQL using Unix socket? + +#DBSocket=/var/run/mysqld/mysqld.sock diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf new file mode 100644 index 0000000..63f14c5 --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.6/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=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=zabbix + +# Database user + +DBUser=root + +# Database password +# Comment this line if no password used + +#DBPassword= + +# Connect to MySQL using Unix socket? + +#DBSocket=/var/run/mysqld/mysqld.sock diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf new file mode 100644 index 0000000..8bbe0f9 --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.6/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=/tmp/zabbix_trapper.log + +# Database host name +# Default is localhost + +#DBHost=localhost + +# Database name + +DBName=zabbix + +# Database user + +DBUser=root + +# Database password +# Comment this line if no password used + +#DBPassword= + +# Connect to MySQL usig Unix socket? + +#DBSocket=/var/run/mysqld/mysqld.sock diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd new file mode 100644 index 0000000..3ed764a --- /dev/null +++ b/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd @@ -0,0 +1,29 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.5 2013/01/18 23:58:34 mattm Exp $ + +pid_file="/var/run/zabbix/zabbix_agentd.pid" + +depend() { + need net + provide zabbix-agent + use zabbix-server +} + +start_pre() { + checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix +} + +start() { + ebegin "Starting Zabbix agent" + start-stop-daemon --start --pidfile ${pid_file} \ + --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf + eend $? +} + +stop() { + ebegin "Stopping Zabbix agent" + start-stop-daemon --stop --pidfile ${pid_file} + eend $? +} diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy b/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy new file mode 100644 index 0000000..f312cc8 --- /dev/null +++ b/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy @@ -0,0 +1,28 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy,v 1.2 2013/07/19 04:27:55 mattm Exp $ + +pid_file="/var/run/zabbix/zabbix_proxy.pid" + +depend() { + need net + provide zabbix-proxy +} + +start_pre() { + checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix +} + +start() { + ebegin "Starting Zabbix proxy" + start-stop-daemon --start --pidfile ${pid_file} \ + --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf + eend $? +} + +stop() { + ebegin "Stopping Zabbix proxy" + start-stop-daemon --stop --pidfile ${pid_file} + eend $? +} diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-server b/net-analyzer/zabbix/files/2.0/init.d/zabbix-server new file mode 100644 index 0000000..5f91941 --- /dev/null +++ b/net-analyzer/zabbix/files/2.0/init.d/zabbix-server @@ -0,0 +1,27 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v 1.4 2013/01/18 23:58:34 mattm Exp $ + +pid_file="/var/run/zabbix/zabbix_server.pid" + +depend() { + need net + use mysql postgresql +} +start_pre() { + checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix +} + +start() { + ebegin "Starting Zabbix server" + start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \ + --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf + eend $? +} + +stop() { + ebegin "Stopping Zabbix server" + start-stop-daemon --stop --pidfile ${pid_file} + eend $? +} diff --git a/net-analyzer/zabbix/files/2.0/patches/zbx282.patch b/net-analyzer/zabbix/files/2.0/patches/zbx282.patch new file mode 100644 index 0000000..4f8ed94 --- /dev/null +++ b/net-analyzer/zabbix/files/2.0/patches/zbx282.patch @@ -0,0 +1,182 @@ +--- configure.in 2013-02-12 04:27:27.000000000 -0700 ++++ configure.in 2013-05-03 07:59:46.318882346 -0600 +@@ -903,19 +903,32 @@ + AC_MSG_CHECKING([for the linux kernel version]) + + kernel=`uname -r` ++ kernel_major=`uname -r|cut -d. -f1` ++ kernel_minor=`uname -r|cut -d. -f2` + +- case "${kernel}" in +- 2.6.*) +- AC_MSG_RESULT([2.6 family (${kernel})]) +- AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you are using Linux 2.6.x]) +- ;; +- 2.4.*) +- AC_MSG_RESULT([2.4 family (${kernel})]) +- AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you are using Linux 2.4.x]) +- ;; +- *) +- AC_MSG_RESULT([unknown family (${kernel})]) +- ;; ++ case "${kernel_major}" in ++ 2) ++ case "${$kernel_minor}" in ++ 6) ++ AC_MSG_RESULT([Linux Kernel >= 2.6.x family (${kernel})]) ++ AC_DEFINE([KERNEL_2_6_Xplus], 1, [Define to 1 if you are using Linux >= 2.6.x]) ++ ;; ++ 4) ++ AC_MSG_RESULT([2.4 family (${kernel})]) ++ AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you are using Linux 2.4.x]) ++ ;; ++ esac ++ ;; ++ 1) ++ echo ++ ;; ++ 0) ++ echo ++ ;; ++ *) ++ AC_MSG_RESULT([Linux Kernel >= 2.6.x family (${kernel})]) ++ AC_DEFINE([KERNEL_2_6_Xplus], 1, [Define to 1 if you are using Linux >= 2.6.x]) ++ ;; + esac + fi + +--- include/config.h.in 2013-02-12 04:27:41.000000000 -0700 ++++ include/config.h.in 2013-05-03 07:47:39.658588709 -0600 +@@ -507,8 +507,8 @@ + /* Define to 1 if you are using Linux 2.4.x */ + #undef KERNEL_2_4 + +-/* Define to 1 if you are using Linux 2.6.x */ +-#undef KERNEL_2_6 ++/* Define to 1 if you are using Linux >= 2.6.x */ ++#undef KERNEL_2_6_Xplus + + /* Define to 1 if LDAP depricated functions is used. */ + #undef LDAP_DEPRECATED + +--- src/libs/zbxsysinfo/linux/sensors.c 2013-02-12 04:27:22.000000000 -0700 ++++ src/libs/zbxsysinfo/linux/sensors.c 2013-05-03 07:47:39.658588709 -0600 +@@ -20,14 +20,21 @@ + #include "common.h" + #include "sysinfo.h" + +-#ifdef KERNEL_2_4 ++#if defined(KERNEL_2_4) || defined(KERNEL_2_6_Xplus) + + #define DO_ONE 0 + #define DO_AVG 1 + #define DO_MAX 2 + #define DO_MIN 3 + ++#if defined(KERNEL_2_4) + #define DEVICE_DIR "/proc/sys/dev/sensors" ++#endif ++ ++#if defined(KERNEL_2_6_Xplus) ++#define DEVICE_DIR "/sys/class/hwmon" ++#define EXTRA "device" ++#endif + + static void count_sensor(int do_task, const char *filename, double *aggr, int *cnt) + { +@@ -46,9 +53,17 @@ + + zbx_fclose(f); + +- if (1 == sscanf(line, "%*f\t%*f\t%lf\n", &value)) ++#if defined(KERNEL_2_6_Xplus) ++ if (1 == sscanf(line, "%lf", &value)) ++#else ++ if (1 == sscanf(line, "%*lf\t%*lf\t%lf\n", &value)) ++#endif + { + (*cnt)++; ++#if defined(KERNEL_2_6_Xplus) ++ if(NULL == strstr(filename, "fan")) ++ value = value / 1000; ++#endif + + switch (do_task) + { +@@ -70,11 +85,35 @@ + + static void get_device_sensors(int do_task, const char *device, const char *name, double *aggr, int *cnt) + { ++#if defined(KERNEL_2_6_Xplus) ++ struct stat buffer; ++ int use_extra = 0; ++#endif + char sensorname[MAX_STRING_LEN]; ++ char sensortest[MAX_STRING_LEN]; ++ ++#if defined(KERNEL_2_6_Xplus) ++ zbx_snprintf(sensortest, sizeof(sensortest), "%s/%s/name", DEVICE_DIR, device); ++ if(stat(sensortest, &buffer) != 0) ++ { ++ zbx_snprintf(sensortest, sizeof(sensortest), "%s/%s/device/name", DEVICE_DIR, device); ++ if(stat(sensortest, &buffer) == 0) ++ { ++ use_extra = 1; ++ } ++ } ++#endif + + if (DO_ONE == do_task) + { ++#if defined(KERNEL_2_6_Xplus) ++ if(use_extra) ++ zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s/%s/%s_input", DEVICE_DIR, device, EXTRA, name); ++ else ++ zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s/%s_input", DEVICE_DIR, device, name); ++#else + zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s/%s", DEVICE_DIR, device, name); ++#endif + count_sensor(do_task, sensorname, aggr, cnt); + } + else +@@ -94,7 +133,14 @@ + if (NULL == zbx_regexp_match(deviceent->d_name, device, NULL)) + continue; + ++#if defined(KERNEL_2_6_Xplus) ++ if(use_extra) ++ zbx_snprintf(devicename, sizeof(devicename), "%s/%s/%s", DEVICE_DIR, deviceent->d_name, EXTRA); ++ else ++ zbx_snprintf(devicename, sizeof(devicename), "%s/%s", DEVICE_DIR, deviceent->d_name); ++#else + zbx_snprintf(devicename, sizeof(devicename), "%s/%s", DEVICE_DIR, deviceent->d_name); ++#endif + + if (NULL == (sensordir = opendir(devicename))) + continue; +@@ -107,7 +153,19 @@ + if (NULL == zbx_regexp_match(sensorent->d_name, name, NULL)) + continue; + ++#if defined(KERNEL_2_6_Xplus) ++ if (0 != strcmp(sensorent->d_name + strlen(sensorent->d_name) - 6, "_input")) ++ continue; ++#endif ++ ++#if defined(KERNEL_2_6_Xplus) ++ if(use_extra) ++ zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s/%s", devicename, sensorent->d_name, EXTRA); ++ else ++ zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s", devicename, sensorent->d_name); ++#else + zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s", devicename, sensorent->d_name); ++#endif + count_sensor(do_task, sensorname, aggr, cnt); + } + closedir(sensordir); +@@ -162,4 +220,4 @@ + return SYSINFO_RET_FAIL; + } + +-#endif /* KERNEL_2_4 */ ++#endif /* KERNEL_2_4 || KERNEL_2_6_Xplus */ diff --git a/net-analyzer/zabbix/files/2.0/patches/zbx6097.patch b/net-analyzer/zabbix/files/2.0/patches/zbx6097.patch new file mode 100644 index 0000000..65d92a8 --- /dev/null +++ b/net-analyzer/zabbix/files/2.0/patches/zbx6097.patch @@ -0,0 +1,66 @@ +Index: frontends/php/authentication.php +=================================================================== +--- frontends/php/authentication.php (revision 32376) ++++ frontends/php/authentication.php (revision 32393) +@@ -101,12 +101,11 @@ + $config['authentication_type'] = $_REQUEST['config']; + + // check login/password +- $login = API::User()->ldapLogin(array( +- 'user' => get_request('user', $USER_DETAILS['alias']), +- 'password' => get_request('user_password', ''), +- 'cnf' => $ldap_cnf +- )); ++ $ldap = new CLdap($ldap_cnf); ++ $ldap->connect(); ++ $login = $ldap->checkPass(get_request('user', $USER_DETAILS['alias']), get_request('user_password', '')); + if (!$login) { ++ error(_('Login name or password is incorrect')); + throw new Exception(); + } + +@@ -129,12 +128,13 @@ + } + elseif (isset($_REQUEST['test'])) { + // check login/password +- $result = API::User()->ldapLogin(array( +- 'user' => get_request('user', $USER_DETAILS['alias']), +- 'password' => get_request('user_password', ''), +- 'cnf' => $ldap_cnf +- )); ++ $ldap = new CLdap($ldap_cnf); ++ $ldap->connect(); ++ $result = $ldap->checkPass(get_request('user', $USER_DETAILS['alias']), get_request('user_password', '')); + ++ if (!$result) ++ error(_('Login name or password is incorrect'));{ ++ } + show_messages($result, _('LDAP login successful'), _('LDAP login was not successful')); + } + } +Index: frontends/php/api/classes/CUser.php +=================================================================== +--- frontends/php/api/classes/CUser.php (revision 32376) ++++ frontends/php/api/classes/CUser.php (revision 32393) +@@ -822,15 +822,12 @@ + // ****************************************************************************** + // LOGIN Methods + // ****************************************************************************** +- public function ldapLogin($user) { +- $cnf = isset($user['cnf']) ? $user['cnf'] : null; +- +- if (is_null($cnf)) { +- $config = select_config(); +- foreach ($config as $id => $value) { +- if (zbx_strpos($id, 'ldap_') !== false) { +- $cnf[str_replace('ldap_', '', $id)] = $config[$id]; +- } ++ protected function ldapLogin($user) { ++ $config = select_config(); ++ $cnf = array(); ++ foreach ($config as $id => $value) { ++ if (zbx_strpos($id, 'ldap_') !== false) { ++ $cnf[str_replace('ldap_', '', $id)] = $config[$id]; + } + } + diff --git a/net-analyzer/zabbix/files/2.0/patches/zbx7479.patch b/net-analyzer/zabbix/files/2.0/patches/zbx7479.patch new file mode 100644 index 0000000..52cabd4 --- /dev/null +++ b/net-analyzer/zabbix/files/2.0/patches/zbx7479.patch @@ -0,0 +1,83 @@ +Index: src/libs/zbxsysinfo/sysinfo.c +=================================================================== +--- src/libs/zbxsysinfo/sysinfo.c (revision 40346) ++++ src/libs/zbxsysinfo/sysinfo.c (working copy) +@@ -267,13 +267,49 @@ + test_parameter(commands[i].key, PROCESS_TEST | PROCESS_USE_TEST_PARAM); + } + ++static int zbx_check_user_parameter(const char *param, char *error, int max_error_len) ++{ ++ const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@\n", *c; ++ char *buf = NULL; ++ size_t buf_alloc = 128, buf_offset = 0; ++ ++ if (0 != CONFIG_UNSAFE_USER_PARAMETERS) ++ return SUCCEED; ++ ++ for (c = suppressed_chars; '\0' != *c; c++) ++ { ++ if (NULL == strchr(param, *c)) ++ continue; ++ ++ buf = zbx_malloc(buf, buf_alloc); ++ ++ for (c = suppressed_chars; '\0' != *c; c++) ++ { ++ if (c != suppressed_chars) ++ zbx_strcpy_alloc(&buf, &buf_alloc, &buf_offset, ", "); ++ ++ if (0 != isprint(*c)) ++ zbx_chrcpy_alloc(&buf, &buf_alloc, &buf_offset, *c); ++ else ++ zbx_snprintf_alloc(&buf, &buf_alloc, &buf_offset, "0x%02x", *c); ++ } ++ ++ zbx_snprintf(error, max_error_len, "special characters \"%s\" are not allowed in the parameters", buf); ++ ++ zbx_free(buf); ++ ++ return FAIL; ++ } ++ ++ return SUCCEED; ++} ++ + static int replace_param(const char *cmd, const char *param, char *out, int outlen, char *error, int max_error_len) + { + int ret = SUCCEED; + char buf[MAX_STRING_LEN]; + char command[MAX_STRING_LEN]; + char *pl, *pr; +- const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@", *c; + + assert(out); + +@@ -305,25 +341,10 @@ + { + get_param(param, (int)(pr[1] - '0'), buf, sizeof(buf)); + +- if (0 == CONFIG_UNSAFE_USER_PARAMETERS) +- { +- for (c = suppressed_chars; '\0' != *c; c++) +- { +- if (NULL != strchr(buf, *c)) +- { +- zbx_snprintf(error, max_error_len, "Special characters '%s'" +- " are not allowed in the parameters", +- suppressed_chars); +- ret = FAIL; +- break; +- } +- } +- } ++ if (SUCCEED != (ret = zbx_check_user_parameter(buf, error, max_error_len))) ++ break; + } + +- if (FAIL == ret) +- break; +- + zbx_strlcat(out, buf, outlen); + outlen -= MIN((int)strlen(buf), (int)outlen); + diff --git a/net-analyzer/zabbix/files/2.0/zabbix_proxy.conf b/net-analyzer/zabbix/files/2.0/zabbix_proxy.conf new file mode 100644 index 0000000..21eed90 --- /dev/null +++ b/net-analyzer/zabbix/files/2.0/zabbix_proxy.conf @@ -0,0 +1,463 @@ +# This is a configuration file for Zabbix Proxy process +# To get more information about Zabbix, +# visit http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: ProxyMode +# Proxy operating mode +# 0 - proxy in the active mode +# 1 - proxy in the passive mode +# +# Mandatory: no +# Default: +# ProxyMode=0 + +### Option: Server +# IP address (or hostname) of Zabbix server. +# Active proxy will get configuration data from the server. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: yes (if ProxyMode is set to 0) +# Default: +# Server= + +Server=127.0.0.1 + +### Option: ServerPort +# Port of Zabbix trapper on Zabbix server. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ServerPort=10051 + +### Option: Hostname +# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server! +# Value is acquired from HostnameItem if undefined. +# +# Mandatory: no +# Default: +# Hostname= + +Hostname=proxy + +### Option: HostnameItem +# Item used for generating Hostname if it is undefined. +# Ignored if Hostname is defined. +# +# Mandatory: no +# Default: +# HostnameItem=system.hostname + +### Option: ListenPort +# Listen port for trapper. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ListenPort=10051 + +### Option: SourceIP +# Source IP address for outgoing connections. +# +# Mandatory: no +# Default: +# SourceIP= + +### Option: LogFile +# Name of log file. +# If not set, syslog is used. +# +# Mandatory: no +# Default: +# LogFile= + +LogFile=/var/log/zabbix/zabbix_proxy.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: PidFile +# Name of PID file. +# +# Mandatory: no +# Default: +# PidFile=/tmp/zabbix_proxy.pid + +### Option: DBHost +# Database host name. +# If set to localhost, socket is used for MySQL. +# If set to empty string, socket is used for PostgreSQL. +# +# Mandatory: no +# Default: +# DBHost=localhost + +### Option: DBName +# Database name. +# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. +# Warning: do not attempt to use the same database Zabbix server is using. +# +# Mandatory: yes +# Default: +# DBName= + +DBName=zabbix_proxy + +### Option: DBSchema +# Schema name. Used for IBM DB2. +# +# Mandatory: no +# Default: +# DBSchema= + +### Option: DBUser +# Database user. Ignored for SQLite. +# +# Default: +# DBUser= + +DBUser=zabbix + +### Option: DBPassword +# Database password. Ignored for SQLite. +# Comment this line if no password is used. +# +# Mandatory: no +# Default: +# DBPassword= + +### Option: DBSocket +# Path to MySQL socket. +# +# Mandatory: no +# Default: +# DBSocket=/tmp/mysql.sock + +# Option: DBPort +# Database port when not using local socket. Ignored for SQLite. +# +# Mandatory: no +# Default (for MySQL): +# DBPort=3306 + +######### PROXY SPECIFIC PARAMETERS ############# + +### Option: ProxyLocalBuffer +# Proxy will keep data locally for N hours, even if the data have already been synced with the server. +# This parameter may be used if local data will be used by third party applications. +# +# Mandatory: no +# Range: 0-720 +# Default: +# ProxyLocalBuffer=0 + +### Option: ProxyOfflineBuffer +# Proxy will keep data for N hours in case if no connectivity with Zabbix Server. +# Older data will be lost. +# +# Mandatory: no +# Range: 1-720 +# Default: +# ProxyOfflineBuffer=1 + +### Option: HeartbeatFrequency +# Frequency of heartbeat messages in seconds. +# Used for monitoring availability of Proxy on server side. +# 0 - heartbeat messages disabled. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 0-3600 +# Default: +# HeartbeatFrequency=60 + +### Option: ConfigFrequency +# How often proxy retrieves configuration data from Zabbix Server in seconds. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1-3600*24*7 +# Default: +# ConfigFrequency=3600 + +### Option: DataSenderFrequency +# Proxy will send collected data to the Server every N seconds. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# DataSenderFrequency=1 + +############ ADVANCED PARAMETERS ################ + +### Option: StartPollers +# Number of pre-forked instances of pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollers=5 + +### Option: StartIPMIPollers +# Number of pre-forked instances of IPMI pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartIPMIPollers=0 + +### Option: StartPollersUnreachable +# Number of pre-forked instances of pollers for unreachable hosts (including IPMI). +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollersUnreachable=1 + +### Option: StartTrappers +# Number of pre-forked instances of trappers. +# Trappers accept incoming connections from Zabbix sender and active agents. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartTrappers=5 + +### Option: StartPingers +# Number of pre-forked instances of ICMP pingers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPingers=1 + +### Option: StartDiscoverers +# Number of pre-forked instances of discoverers. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartDiscoverers=1 + +### Option: StartHTTPPollers +# Number of pre-forked instances of HTTP pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartHTTPPollers=1 + +### Option: JavaGateway +# IP address (or hostname) of Zabbix Java gateway. +# Only required if Java pollers are started. +# +# Mandatory: no +# Default: +# JavaGateway= + +### Option: JavaGatewayPort +# Port that Zabbix Java gateway listens on. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# JavaGatewayPort=10052 + +### Option: StartJavaPollers +# Number of pre-forked instances of Java pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartJavaPollers=0 + +### Option: SNMPTrapperFile +# Temporary file used for passing data from SNMP trap daemon to the proxy. +# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. +# +# Mandatory: no +# Default: +# SNMPTrapperFile=/tmp/zabbix_traps.tmp + +### Option: StartSNMPTrapper +# If 1, SNMP trapper process is started. +# +# Mandatory: no +# Range: 0-1 +# Default: +# StartSNMPTrapper=0 + +### Option: ListenIP +# List of comma delimited IP addresses that the trapper should listen on. +# Trapper will listen on all network interfaces if this parameter is missing. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +### Option: HousekeepingFrequency +# How often Zabbix will perform housekeeping procedure (in hours). +# Housekeeping is removing unnecessary information from history, alert, and alarms tables. +# +# Mandatory: no +# Range: 1-24 +# Default: +# HousekeepingFrequency=1 + +### Option: CacheSize +# Size of configuration cache, in bytes. +# Shared memory size, for storing hosts and items data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# CacheSize=8M + +### Option: StartDBSyncers +# Number of pre-forked instances of DB Syncers +# +# Mandatory: no +# Range: 1-100 +# Default: +# StartDBSyncers=4 + +### Option: HistoryCacheSize +# Size of history cache, in bytes. +# Shared memory size for storing history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryCacheSize=8M + +### Option: HistoryTextCacheSize +# Size of text history cache, in bytes. +# Shared memory size for storing character, text or log history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryTextCacheSize=16M + +### Option: Timeout +# Specifies how long we wait for agent, SNMP device or external check (in seconds). +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: TrapperTimeout +# Specifies how many seconds trapper may spend processing new data. +# +# Mandatory: no +# Range: 1-300 +# Default: +# TrapperTimeout=300 + +### Option: UnreachablePeriod +# After how many seconds of unreachability treat a host as unavailable. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachablePeriod=45 + +### Option: UnavailableDelay +# How often host is checked for availability during the unavailability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnavailableDelay=60 + +### Option: UnreachableDelay +# How often host is checked for availability during the unreachability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachableDelay=15 + +### Option: ExternalScripts +# Full path to location of external scripts. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# ExternalScripts=${datadir}/zabbix/externalscripts + +### Option: FpingLocation +# Location of fping. +# Make sure that fping binary has root ownership and SUID flag set. +# +# Mandatory: no +# Default: +# FpingLocation=/usr/sbin/fping + +### Option: Fping6Location +# Location of fping6. +# Make sure that fping6 binary has root ownership and SUID flag set. +# Make empty if your fping utility is capable to process IPv6 addresses. +# +# Mandatory: no +# Default: +# Fping6Location=/usr/sbin/fping6 + +### Option: SSHKeyLocation +# Location of public and private keys for SSH checks and actions +# +# Mandatory: no +# Default: +# SSHKeyLocation= + +### Option: LogSlowQueries +# How long a database query may take before being logged (in milliseconds). +# Only works if DebugLevel set to 3 or 4. +# 0 - don't log slow queries. +# +# Mandatory: no +# Range: 1-3600000 +# Default: +# LogSlowQueries=0 + +### Option: TmpDir +# Temporary directory. +# +# Mandatory: no +# Default: +# TmpDir=/tmp + +### Option: Include +# You may include individual files or all files in a directory in the configuration file. +# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/usr/local/etc/zabbix_proxy.general.conf +# Include=/usr/local/etc/zabbix_proxy.conf.d/ diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd new file mode 100644 index 0000000..348265d --- /dev/null +++ b/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd @@ -0,0 +1,29 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd,v 1.1 2013/11/16 07:18:54 mattm Exp $ + +pid_file="/run/zabbix/zabbix_agentd.pid" + +depend() { + need net + provide zabbix-agent + use zabbix-server +} + +start_pre() { + checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix +} + +start() { + ebegin "Starting Zabbix agent" + start-stop-daemon --start --pidfile ${pid_file} \ + --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf + eend $? +} + +stop() { + ebegin "Stopping Zabbix agent" + start-stop-daemon --stop --pidfile ${pid_file} + eend $? +} diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy b/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy new file mode 100644 index 0000000..38bce75 --- /dev/null +++ b/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy @@ -0,0 +1,28 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy,v 1.1 2013/11/16 07:18:54 mattm Exp $ + +pid_file="/run/zabbix/zabbix_proxy.pid" + +depend() { + need net + provide zabbix-proxy +} + +start_pre() { + checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix +} + +start() { + ebegin "Starting Zabbix proxy" + start-stop-daemon --start --pidfile ${pid_file} \ + --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf + eend $? +} + +stop() { + ebegin "Stopping Zabbix proxy" + start-stop-daemon --stop --pidfile ${pid_file} + eend $? +} diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-server b/net-analyzer/zabbix/files/2.2/init.d/zabbix-server new file mode 100644 index 0000000..bd17c19 --- /dev/null +++ b/net-analyzer/zabbix/files/2.2/init.d/zabbix-server @@ -0,0 +1,27 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.2/init.d/zabbix-server,v 1.1 2013/11/16 07:18:54 mattm Exp $ + +pid_file="/run/zabbix/zabbix_server.pid" + +depend() { + need net + use mysql postgresql +} +start_pre() { + checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix +} + +start() { + ebegin "Starting Zabbix server" + start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \ + --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf + eend $? +} + +stop() { + ebegin "Stopping Zabbix server" + start-stop-daemon --stop --pidfile ${pid_file} + eend $? +} diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch b/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch new file mode 100644 index 0000000..79bb92f --- /dev/null +++ b/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch @@ -0,0 +1,83 @@ +Index: src/libs/zbxsysinfo/sysinfo.c +=================================================================== +--- src/libs/zbxsysinfo/sysinfo.c (revision 40348) ++++ src/libs/zbxsysinfo/sysinfo.c (working copy) +@@ -427,13 +427,49 @@ + test_aliases(); + } + ++static int zbx_check_user_parameter(const char *param, char *error, int max_error_len) ++{ ++ const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@\n", *c; ++ char *buf = NULL; ++ size_t buf_alloc = 128, buf_offset = 0; ++ ++ if (0 != CONFIG_UNSAFE_USER_PARAMETERS) ++ return SUCCEED; ++ ++ for (c = suppressed_chars; '\0' != *c; c++) ++ { ++ if (NULL == strchr(param, *c)) ++ continue; ++ ++ buf = zbx_malloc(buf, buf_alloc); ++ ++ for (c = suppressed_chars; '\0' != *c; c++) ++ { ++ if (c != suppressed_chars) ++ zbx_strcpy_alloc(&buf, &buf_alloc, &buf_offset, ", "); ++ ++ if (0 != isprint(*c)) ++ zbx_chrcpy_alloc(&buf, &buf_alloc, &buf_offset, *c); ++ else ++ zbx_snprintf_alloc(&buf, &buf_alloc, &buf_offset, "0x%02x", *c); ++ } ++ ++ zbx_snprintf(error, max_error_len, "special characters \"%s\" are not allowed in the parameters", buf); ++ ++ zbx_free(buf); ++ ++ return FAIL; ++ } ++ ++ return SUCCEED; ++} ++ + static int replace_param(const char *cmd, const char *param, char *out, int outlen, char *error, int max_error_len) + { + int ret = SUCCEED; + char buf[MAX_STRING_LEN]; + char command[MAX_STRING_LEN]; + char *pl, *pr; +- const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@", *c; + + assert(out); + +@@ -465,25 +501,10 @@ + { + get_param(param, (int)(pr[1] - '0'), buf, sizeof(buf)); + +- if (0 == CONFIG_UNSAFE_USER_PARAMETERS) +- { +- for (c = suppressed_chars; '\0' != *c; c++) +- { +- if (NULL != strchr(buf, *c)) +- { +- zbx_snprintf(error, max_error_len, "Special characters '%s'" +- " are not allowed in the parameters", +- suppressed_chars); +- ret = FAIL; +- break; +- } +- } +- } ++ if (SUCCEED != (ret = zbx_check_user_parameter(buf, error, max_error_len))) ++ break; + } + +- if (FAIL == ret) +- break; +- + zbx_strlcat(out, buf, outlen); + outlen -= MIN((int)strlen(buf), (int)outlen); + diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch b/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch new file mode 100644 index 0000000..076e10a --- /dev/null +++ b/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch @@ -0,0 +1,53 @@ +Index: frontends/php/include/defines.inc.php +=================================================================== +--- frontends/php/include/defines.inc.php (revision 46596) ++++ frontends/php/include/defines.inc.php (revision 46655) +@@ -835,6 +835,14 @@ + + define('ZBX_DEFAULT_IMPORT_HOST_GROUP', 'Imported hosts'); + ++// XML import flags ++// See ZBX-8151. Old version of libxml suffered from setting DTDLOAD and NOENT flags by default, which allowed ++// performing XXE attacks. Calling libxml_disable_entity_loader(true) also had no affect if flags passed to libxml ++// calls were 0 - so for better security with legacy libxml we need to call libxml_disable_entity_loader(true) AND ++// pass the LIBXML_NONET flag. Please keep in mind that LIBXML_NOENT actually EXPANDS entities, opposite to it's name - ++// so this flag is not needed here. ++define('LIBXML_IMPORT_FLAGS', LIBXML_NONET); ++ + // API errors + define('ZBX_API_ERROR_INTERNAL', 111); + define('ZBX_API_ERROR_PARAMETERS', 100); +Index: frontends/php/include/classes/import/readers/CXmlImportReader.php +=================================================================== +--- frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46596) ++++ frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46655) +@@ -32,7 +32,8 @@ + */ + public function read($string) { + libxml_use_internal_errors(true); +- $result = simplexml_load_string($string); ++ libxml_disable_entity_loader(true); ++ $result = simplexml_load_string($string, null, LIBXML_IMPORT_FLAGS); + if (!$result) { + $errors = libxml_get_errors(); + libxml_clear_errors(); +Index: frontends/php/include/classes/import/CXmlImport18.php +=================================================================== +--- frontends/php/include/classes/import/CXmlImport18.php (revision 46596) ++++ frontends/php/include/classes/import/CXmlImport18.php (revision 46655) +@@ -390,12 +390,13 @@ + return $array; + } + +- public static function import($file) { ++ public static function import($source) { + + libxml_use_internal_errors(true); ++ libxml_disable_entity_loader(true); + + $xml = new DOMDocument(); +- if (!$xml->loadXML($file)) { ++ if (!$xml->loadXML($source, LIBXML_IMPORT_FLAGS)) { + $text = ''; + foreach (libxml_get_errors() as $error) { + switch ($error->level) { diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agent.conf b/net-analyzer/zabbix/files/2.2/zabbix_agent.conf new file mode 100644 index 0000000..dcb4b72 --- /dev/null +++ b/net-analyzer/zabbix/files/2.2/zabbix_agent.conf @@ -0,0 +1,81 @@ +# This is a config file for Zabbix internet service daemon agent +# To get more information about Zabbix visit http://www.zabbix.com + +### Option: Server +# IP address of Zabbix server +# Connections from other hosts will be denied +# 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=127.0.0.1 + +############ ADVANCED PARAMETERS ################# + +### Option: Alias +# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one. +# +# Mandatory: no +# Range: +# Default: + +### 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. +# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/usr/local/etc/zabbix_agent.userparams.conf +# Include=/usr/local/etc/zabbix_agent.conf.d/ + +####### 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 +# Default: +# UnsafeUserParameters=0 + +### Option: UserParameter +# User-defined parameter to monitor. There can be several user-defined parameters. +# Format: UserParameter=, +# See 'zabbix_agentd' directory for examples. +# +# Mandatory: no +# Default: +# UserParameter= + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of agent modules. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# LoadModulePath=${libdir}/modules + +### Option: LoadModule +# Module to load at agent startup. Modules are used to extend functionality of the agent. +# Format: LoadModule= +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf b/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf new file mode 100644 index 0000000..4d49d36 --- /dev/null +++ b/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf @@ -0,0 +1,278 @@ +# This is a config file for the Zabbix agent daemon (Unix) +# To get more information about Zabbix, visit http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: PidFile +# Name of PID file. +# +# Mandatory: no +# Default: +PidFile=/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=128 + +### 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. +# Incoming connections will be accepted only from the hosts listed here. +# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. +# +# Mandatory: no +# Default: +# Server= + +Server=127.0.0.1 + +### 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. +# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +### Option: StartAgents +# Number of pre-forked instances of zabbix_agentd that process passive checks. +# If set to 0, disables passive checks and the agent will not listen on any TCP port. +# +# Mandatory: no +# Range: 0-100 +# Default: +# StartAgents=3 + +##### Active checks related + +### Option: ServerActive +# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. +# If port is not specified, default port is used. +# IPv6 addresses must be enclosed in square brackets if port for that host is specified. +# If port is not specified, square brackets for IPv6 addresses are optional. +# If this parameter is not specified, active checks are disabled. +# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] +# +# Mandatory: no +# 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. +# Value is acquired from HostnameItem if undefined. +# +# Mandatory: no +# Default: +# Hostname= + +Hostname=Zabbix server + +### Option: HostnameItem +# Item used for generating Hostname if it is undefined. +# Ignored if Hostname is defined. +# +# Mandatory: no +# Default: +# HostnameItem=system.hostname + +### Option: HostMetadata +# Optional parameter that defines host metadata. +# Host metadata is used at host auto-registration process. +# An agent will issue an error and not start if the value is over limit of 255 characters. +# If not defined, value will be acquired from HostMetadataItem. +# +# Mandatory: no +# Range: 0-255 characters +# Default: +# HostMetadata= + +### Option: HostMetadataItem +# Optional parameter that defines an item used for getting host metadata. +# Host metadata is used at host auto-registration process. +# During an auto-registration request an agent will log a warning message if +# the value returned by specified item is over limit of 255 characters. +# This option is only used when HostMetadata is not defined. +# +# Mandatory: no +# Default: +# HostMetadataItem= + +### 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: Alias +# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one. +# +# Mandatory: no +# Range: +# Default: + +### Option: Timeout +# Spend no more than Timeout seconds on processing +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: AllowRoot +# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent +# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Default: +# AllowRoot=0 + +### Option: Include +# You may include individual files or all files in a directory in the configuration file. +# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/usr/local/etc/zabbix_agentd.userparams.conf +# Include=/usr/local/etc/zabbix_agentd.conf.d/ + +####### 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=, +# See 'zabbix_agentd' directory for examples. +# +# Mandatory: no +# Default: +# UserParameter= + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of agent modules. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# LoadModulePath=${libdir}/modules + +### Option: LoadModule +# Module to load at agent startup. Modules are used to extend functionality of the agent. +# Format: LoadModule= +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= diff --git a/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf b/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf new file mode 100644 index 0000000..d4bae2e --- /dev/null +++ b/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf @@ -0,0 +1,519 @@ +# This is a configuration file for Zabbix Proxy process +# To get more information about Zabbix, +# visit http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: ProxyMode +# Proxy operating mode +# 0 - proxy in the active mode +# 1 - proxy in the passive mode +# +# Mandatory: no +# Default: +# ProxyMode=0 + +### Option: Server +# IP address (or hostname) of Zabbix server. +# Active proxy will get configuration data from the server. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: yes (if ProxyMode is set to 0) +# Default: +# Server= + +Server=127.0.0.1 + +### Option: ServerPort +# Port of Zabbix trapper on Zabbix server. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ServerPort=10051 + +### Option: Hostname +# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server! +# Value is acquired from HostnameItem if undefined. +# +# Mandatory: no +# Default: +# Hostname= + +Hostname=Zabbix proxy + +### Option: HostnameItem +# Item used for generating Hostname if it is undefined. +# Ignored if Hostname is defined. +# +# Mandatory: no +# Default: +# HostnameItem=system.hostname + +### Option: ListenPort +# Listen port for trapper. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ListenPort=10051 + +### Option: SourceIP +# Source IP address for outgoing connections. +# +# Mandatory: no +# Default: +# SourceIP= + +### Option: LogFile +# Name of log file. +# If not set, syslog is used. +# +# Mandatory: no +# Default: +# LogFile= + +LogFile=/var/log/zabbix/zabbix_proxy.log + +### Option: LogFileSize +# Maximum size of log file in MB. +# 0 - disable automatic log rotation. +# +# Mandatory: no +# Range: 0-1024 +# Default: +LogFileSize=128 + +### 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: PidFile +# Name of PID file. +# +# Mandatory: no +# Default: +PidFile=/run/zabbix/zabbix_proxy.pid + +### Option: DBHost +# Database host name. +# If set to localhost, socket is used for MySQL. +# If set to empty string, socket is used for PostgreSQL. +# +# Mandatory: no +# Default: +# DBHost=localhost + +### Option: DBName +# Database name. +# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. +# Warning: do not attempt to use the same database Zabbix server is using. +# +# Mandatory: yes +# Default: +# DBName= + +DBName=zabbix_proxy + +### Option: DBSchema +# Schema name. Used for IBM DB2. +# +# Mandatory: no +# Default: +# DBSchema= + +### Option: DBUser +# Database user. Ignored for SQLite. +# +# Default: +# DBUser= + +DBUser=root + +### Option: DBPassword +# Database password. Ignored for SQLite. +# Comment this line if no password is used. +# +# Mandatory: no +# Default: +# DBPassword= + +### Option: DBSocket +# Path to MySQL socket. +# +# Mandatory: no +# Default: +# DBSocket=/tmp/mysql.sock + +# Option: DBPort +# Database port when not using local socket. Ignored for SQLite. +# +# Mandatory: no +# Default (for MySQL): +# DBPort=3306 + +######### PROXY SPECIFIC PARAMETERS ############# + +### Option: ProxyLocalBuffer +# Proxy will keep data locally for N hours, even if the data have already been synced with the server. +# This parameter may be used if local data will be used by third party applications. +# +# Mandatory: no +# Range: 0-720 +# Default: +# ProxyLocalBuffer=0 + +### Option: ProxyOfflineBuffer +# Proxy will keep data for N hours in case if no connectivity with Zabbix Server. +# Older data will be lost. +# +# Mandatory: no +# Range: 1-720 +# Default: +# ProxyOfflineBuffer=1 + +### Option: HeartbeatFrequency +# Frequency of heartbeat messages in seconds. +# Used for monitoring availability of Proxy on server side. +# 0 - heartbeat messages disabled. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 0-3600 +# Default: +# HeartbeatFrequency=60 + +### Option: ConfigFrequency +# How often proxy retrieves configuration data from Zabbix Server in seconds. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1-3600*24*7 +# Default: +# ConfigFrequency=3600 + +### Option: DataSenderFrequency +# Proxy will send collected data to the Server every N seconds. +# For a proxy in the passive mode this parameter will be ignored. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# DataSenderFrequency=1 + +############ ADVANCED PARAMETERS ################ + +### Option: StartPollers +# Number of pre-forked instances of pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollers=5 + +### Option: StartIPMIPollers +# Number of pre-forked instances of IPMI pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartIPMIPollers=0 + +### Option: StartPollersUnreachable +# Number of pre-forked instances of pollers for unreachable hosts (including IPMI). +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollersUnreachable=1 + +### Option: StartTrappers +# Number of pre-forked instances of trappers. +# Trappers accept incoming connections from Zabbix sender and active agents. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartTrappers=5 + +### Option: StartPingers +# Number of pre-forked instances of ICMP pingers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPingers=1 + +### Option: StartDiscoverers +# Number of pre-forked instances of discoverers. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartDiscoverers=1 + +### Option: StartHTTPPollers +# Number of pre-forked instances of HTTP pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartHTTPPollers=1 + +### Option: JavaGateway +# IP address (or hostname) of Zabbix Java gateway. +# Only required if Java pollers are started. +# +# Mandatory: no +# Default: +# JavaGateway= + +### Option: JavaGatewayPort +# Port that Zabbix Java gateway listens on. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# JavaGatewayPort=10052 + +### Option: StartJavaPollers +# Number of pre-forked instances of Java pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartJavaPollers=0 + +### Option: StartVMwareCollectors +# Number of pre-forked vmware collector instances. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartVMwareCollectors=0 + +### Option: VMwareFrequency +# How often Zabbix will connect to VMware service to obtain a new data. +# +# Mandatory: no +# Range: 10-86400 +# Default: +# VMwareFrequency=60 + +### Option: VMwareCacheSize +# Size of VMware cache, in bytes. +# Shared memory size for storing VMware data. +# Only used if VMware collectors are started. +# +# Mandatory: no +# Range: 256K-2G +# Default: +# VMwareCacheSize=8M + +### Option: SNMPTrapperFile +# Temporary file used for passing data from SNMP trap daemon to the proxy. +# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. +# +# Mandatory: no +# Default: +# SNMPTrapperFile=/tmp/zabbix_traps.tmp + +### Option: StartSNMPTrapper +# If 1, SNMP trapper process is started. +# +# Mandatory: no +# Range: 0-1 +# Default: +# StartSNMPTrapper=0 + +### Option: ListenIP +# List of comma delimited IP addresses that the trapper should listen on. +# Trapper will listen on all network interfaces if this parameter is missing. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +### Option: HousekeepingFrequency +# How often Zabbix will perform housekeeping procedure (in hours). +# Housekeeping is removing unnecessary information from history, alert, and alarms tables. +# +# Mandatory: no +# Range: 1-24 +# Default: +# HousekeepingFrequency=1 + +### Option: CacheSize +# Size of configuration cache, in bytes. +# Shared memory size, for storing hosts and items data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# CacheSize=8M + +### Option: StartDBSyncers +# Number of pre-forked instances of DB Syncers +# +# Mandatory: no +# Range: 1-100 +# Default: +# StartDBSyncers=4 + +### Option: HistoryCacheSize +# Size of history cache, in bytes. +# Shared memory size for storing history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryCacheSize=8M + +### Option: HistoryTextCacheSize +# Size of text history cache, in bytes. +# Shared memory size for storing character, text or log history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryTextCacheSize=16M + +### Option: Timeout +# Specifies how long we wait for agent, SNMP device or external check (in seconds). +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: TrapperTimeout +# Specifies how many seconds trapper may spend processing new data. +# +# Mandatory: no +# Range: 1-300 +# Default: +# TrapperTimeout=300 + +### Option: UnreachablePeriod +# After how many seconds of unreachability treat a host as unavailable. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachablePeriod=45 + +### Option: UnavailableDelay +# How often host is checked for availability during the unavailability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnavailableDelay=60 + +### Option: UnreachableDelay +# How often host is checked for availability during the unreachability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachableDelay=15 + +### Option: ExternalScripts +# Full path to location of external scripts. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# ExternalScripts=${datadir}/zabbix/externalscripts + +### Option: FpingLocation +# Location of fping. +# Make sure that fping binary has root ownership and SUID flag set. +# +# Mandatory: no +# Default: +# FpingLocation=/usr/sbin/fping + +### Option: Fping6Location +# Location of fping6. +# Make sure that fping6 binary has root ownership and SUID flag set. +# Make empty if your fping utility is capable to process IPv6 addresses. +# +# Mandatory: no +# Default: +# Fping6Location=/usr/sbin/fping6 + +### Option: SSHKeyLocation +# Location of public and private keys for SSH checks and actions. +# +# Mandatory: no +# Default: +# SSHKeyLocation= + +### Option: LogSlowQueries +# How long a database query may take before being logged (in milliseconds). +# Only works if DebugLevel set to 3 or 4. +# 0 - don't log slow queries. +# +# Mandatory: no +# Range: 1-3600000 +# Default: +# LogSlowQueries=0 + +### Option: TmpDir +# Temporary directory. +# +# Mandatory: no +# Default: +# TmpDir=/tmp + +### Option: AllowRoot +# Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy +# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Default: +# AllowRoot=0 + +### Option: Include +# You may include individual files or all files in a directory in the configuration file. +# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/usr/local/etc/zabbix_proxy.general.conf +# Include=/usr/local/etc/zabbix_proxy.conf.d/ + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of proxy modules. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# LoadModulePath=${libdir}/modules + +### Option: LoadModule +# Module to load at proxy startup. Modules are used to extend functionality of the proxy. +# Format: LoadModule= +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= diff --git a/net-analyzer/zabbix/files/2.2/zabbix_server.conf b/net-analyzer/zabbix/files/2.2/zabbix_server.conf new file mode 100644 index 0000000..caba019 --- /dev/null +++ b/net-analyzer/zabbix/files/2.2/zabbix_server.conf @@ -0,0 +1,546 @@ +# This is a configuration file for Zabbix Server process +# To get more information about Zabbix, +# visit http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: NodeID +# Unique NodeID in distributed setup. +# 0 - standalone server +# +# Mandatory: no +# Range: 0-999 +# Default: +# NodeID=0 + +### Option: ListenPort +# Listen port for trapper. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ListenPort=10051 + +### Option: SourceIP +# Source IP address for outgoing connections. +# +# Mandatory: no +# Default: +# SourceIP= + +### Option: LogFile +# Name of log file. +# If not set, syslog is used. +# +# Mandatory: no +# Default: +# LogFile= + +LogFile=/var/log/zabbix/zabbix_server.log + +### Option: LogFileSize +# Maximum size of log file in MB. +# 0 - disable automatic log rotation. +# +# Mandatory: no +# Range: 0-1024 +# Default: +LogFileSize=128 + +### 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: PidFile +# Name of PID file. +# +# Mandatory: no +# Default: +PidFile=/run/zabbix/zabbix_server.pid + +### Option: DBHost +# Database host name. +# If set to localhost, socket is used for MySQL. +# If set to empty string, socket is used for PostgreSQL. +# +# Mandatory: no +# Default: +# DBHost=localhost + +### Option: DBName +# Database name. +# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. +# +# Mandatory: yes +# Default: +# DBName= + +DBName=zabbix + +### Option: DBSchema +# Schema name. Used for IBM DB2. +# +# Mandatory: no +# Default: +# DBSchema= + +### Option: DBUser +# Database user. Ignored for SQLite. +# +# Mandatory: no +# Default: +# DBUser= + +DBUser=root + +### Option: DBPassword +# Database password. Ignored for SQLite. +# Comment this line if no password is used. +# +# Mandatory: no +# Default: +# DBPassword= + +### Option: DBSocket +# Path to MySQL socket. +# +# Mandatory: no +# Default: +# DBSocket=/tmp/mysql.sock + +### Option: DBPort +# Database port when not using local socket. Ignored for SQLite. +# +# Mandatory: no +# Range: 1024-65535 +# Default (for MySQL): +# DBPort=3306 + +############ ADVANCED PARAMETERS ################ + +### Option: StartPollers +# Number of pre-forked instances of pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollers=5 + +### Option: StartIPMIPollers +# Number of pre-forked instances of IPMI pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartIPMIPollers=0 + +### Option: StartPollersUnreachable +# Number of pre-forked instances of pollers for unreachable hosts (including IPMI). +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPollersUnreachable=1 + +### Option: StartTrappers +# Number of pre-forked instances of trappers. +# Trappers accept incoming connections from Zabbix sender, active agents, active proxies and child nodes. +# At least one trapper process must be running to display server availability in the frontend. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartTrappers=5 + +### Option: StartPingers +# Number of pre-forked instances of ICMP pingers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartPingers=1 + +### Option: StartDiscoverers +# Number of pre-forked instances of discoverers. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartDiscoverers=1 + +### Option: StartHTTPPollers +# Number of pre-forked instances of HTTP pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartHTTPPollers=1 + +### Option: StartTimers +# Number of pre-forked instances of timers. +# Timers process time-based trigger functions and maintenance periods. +# Only the first timer process handles the maintenance periods. +# +# Mandatory: no +# Range: 1-1000 +# Default: +# StartTimers=1 + +### Option: JavaGateway +# IP address (or hostname) of Zabbix Java gateway. +# Only required if Java pollers are started. +# +# Mandatory: no +# Default: +# JavaGateway= + +### Option: JavaGatewayPort +# Port that Zabbix Java gateway listens on. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# JavaGatewayPort=10052 + +### Option: StartJavaPollers +# Number of pre-forked instances of Java pollers. +# +# Mandatory: no +# Range: 0-1000 +# Default: +# StartJavaPollers=0 + +### Option: StartVMwareCollectors +# Number of pre-forked vmware collector instances. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartVMwareCollectors=0 + +### Option: VMwareFrequency +# How often Zabbix will connect to VMware service to obtain a new data. +# +# Mandatory: no +# Range: 10-86400 +# Default: +# VMwareFrequency=60 + +### Option: VMwareCacheSize +# Size of VMware cache, in bytes. +# Shared memory size for storing VMware data. +# Only used if VMware collectors are started. +# +# Mandatory: no +# Range: 256K-2G +# Default: +# VMwareCacheSize=8M + +### Option: SNMPTrapperFile +# Temporary file used for passing data from SNMP trap daemon to the server. +# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. +# +# Mandatory: no +# Default: +# SNMPTrapperFile=/tmp/zabbix_traps.tmp + +### Option: StartSNMPTrapper +# If 1, SNMP trapper process is started. +# +# Mandatory: no +# Range: 0-1 +# Default: +# StartSNMPTrapper=0 + +### Option: ListenIP +# List of comma delimited IP addresses that the trapper should listen on. +# Trapper will listen on all network interfaces if this parameter is missing. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +# ListenIP=127.0.0.1 + +### Option: HousekeepingFrequency +# How often Zabbix will perform housekeeping procedure (in hours). +# Housekeeping is removing unnecessary information from history, alert, and alarms tables. +# +# Mandatory: no +# Range: 1-24 +# Default: +# HousekeepingFrequency=1 + +### Option: MaxHousekeeperDelete +# The table "housekeeper" contains "tasks" for housekeeping procedure in the format: +# [housekeeperid], [tablename], [field], [value]. +# No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value]) +# will be deleted per one task in one housekeeping cycle. +# SQLite3 does not use this parameter, deletes all corresponding rows without a limit. +# If set to 0 then no limit is used at all. In this case you must know what you are doing! +# +# Mandatory: no +# Range: 0-1000000 +# Default: +# MaxHousekeeperDelete=500 + +### Option: SenderFrequency +# How often Zabbix will try to send unsent alerts (in seconds). +# +# Mandatory: no +# Range: 5-3600 +# Default: +# SenderFrequency=30 + +### Option: CacheSize +# Size of configuration cache, in bytes. +# Shared memory size for storing host, item and trigger data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# CacheSize=8M + +### Option: CacheUpdateFrequency +# How often Zabbix will perform update of configuration cache, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# CacheUpdateFrequency=60 + +### Option: StartDBSyncers +# Number of pre-forked instances of DB Syncers +# +# Mandatory: no +# Range: 1-100 +# Default: +# StartDBSyncers=4 + +### Option: HistoryCacheSize +# Size of history cache, in bytes. +# Shared memory size for storing history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryCacheSize=8M + +### Option: TrendCacheSize +# Size of trend cache, in bytes. +# Shared memory size for storing trends data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# TrendCacheSize=4M + +### Option: HistoryTextCacheSize +# Size of text history cache, in bytes. +# Shared memory size for storing character, text or log history data. +# +# Mandatory: no +# Range: 128K-2G +# Default: +# HistoryTextCacheSize=16M + +### Option: ValueCacheSize +# Size of history value cache, in bytes. +# Shared memory size for caching item history data requests +# Setting to 0 disables value cache. +# +# Mandatory: no +# Range: 0,128K-64G +# Default: +# ValueCacheSize=8M + +### Option: NodeNoEvents +# If set to '1' local events won't be sent to master node. +# This won't impact ability of this node to propagate events from its child nodes. +# +# Mandatory: no +# Range: 0-1 +# Default: +# NodeNoEvents=0 + +### Option: NodeNoHistory +# If set to '1' local history won't be sent to master node. +# This won't impact ability of this node to propagate history from its child nodes. +# +# Mandatory: no +# Range: 0-1 +# Default: +# NodeNoHistory=0 + +### Option: Timeout +# Specifies how long we wait for agent, SNMP device or external check (in seconds). +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: TrapperTimeout +# Specifies how many seconds trapper may spend processing new data. +# +# Mandatory: no +# Range: 1-300 +# Default: +# TrapperTimeout=300 + +### Option: UnreachablePeriod +# After how many seconds of unreachability treat a host as unavailable. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachablePeriod=45 + +### Option: UnavailableDelay +# How often host is checked for availability during the unavailability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnavailableDelay=60 + +### Option: UnreachableDelay +# How often host is checked for availability during the unreachability period, in seconds. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# UnreachableDelay=15 + +### Option: AlertScriptsPath +# Full path to location of custom alert scripts. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +AlertScriptsPath=/var/lib/zabbix/alertscripts + +### Option: ExternalScripts +# Full path to location of external scripts. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +ExternalScripts=/var/lib/zabbix/externalscripts + +### Option: FpingLocation +# Location of fping. +# Make sure that fping binary has root ownership and SUID flag set. +# +# Mandatory: no +# Default: +# FpingLocation=/usr/sbin/fping + +### Option: Fping6Location +# Location of fping6. +# Make sure that fping6 binary has root ownership and SUID flag set. +# Make empty if your fping utility is capable to process IPv6 addresses. +# +# Mandatory: no +# Default: +# Fping6Location=/usr/sbin/fping6 + +### Option: SSHKeyLocation +# Location of public and private keys for SSH checks and actions. +# +# Mandatory: no +# Default: +# SSHKeyLocation= + +### Option: LogSlowQueries +# How long a database query may take before being logged (in milliseconds). +# Only works if DebugLevel set to 3 or 4. +# 0 - don't log slow queries. +# +# Mandatory: no +# Range: 1-3600000 +# Default: +# LogSlowQueries=0 + +### Option: TmpDir +# Temporary directory. +# +# Mandatory: no +# Default: +# TmpDir=/tmp + +### Option: StartProxyPollers +# Number of pre-forked instances of pollers for passive proxies. +# +# Mandatory: no +# Range: 0-250 +# Default: +# StartProxyPollers=1 + +### Option: ProxyConfigFrequency +# How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds. +# This parameter is used only for proxies in the passive mode. +# +# Mandatory: no +# Range: 1-3600*24*7 +# Default: +# ProxyConfigFrequency=3600 + +### Option: ProxyDataFrequency +# How often Zabbix Server requests history data from a Zabbix Proxy in seconds. +# This parameter is used only for proxies in the passive mode. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# ProxyDataFrequency=1 + +### Option: AllowRoot +# Allow the server to run as 'root'. If disabled and the server is started by 'root', the server +# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Default: +# AllowRoot=0 + +### Option: Include +# You may include individual files or all files in a directory in the configuration file. +# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +# Include=/usr/local/etc/zabbix_server.general.conf +#Include=/etc/zabbix/zabbix_server.conf.d/ + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of server modules. +# Default depends on compilation options. +# +# Mandatory: no +# Default: +# LoadModulePath=${libdir}/modules + +### Option: LoadModule +# Module to load at server startup. Modules are used to extend functionality of the server. +# Format: LoadModule= +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= diff --git a/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch b/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch new file mode 100644 index 0000000..254634d --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch @@ -0,0 +1,83 @@ +From 90b086b4daebf61756e3d6f8926cf8951a2fc96a Mon Sep 17 00:00:00 2001 +From: Vladimir V. Kamarzin +Date: Fri, 22 Oct 2010 17:47:01 +0600 +Subject: [PATCH 1/2] Fix linking with ldap libs + +Move "-lldap -llber" from LDAP_LDFLAGS to LDAP_LIBS and include them to +LIBS +--- + configure.in | 1 + + m4/ldap.m4 | 4 +++- + 2 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index d3d981b..b11b2ee 100644 +--- a/configure.in ++++ b/configure.in +@@ -1281,6 +1281,7 @@ if test "x$want_ldap" = "xyes"; then + fi + CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}" + SERVER_LDFLAGS="${SERVER_LDFLAGS} ${LDAP_LDFLAGS}" ++LIBS="${LIBS} ${LDAP_LIBS}" + PROXY_LDFLAGS="${PROXY_LDFLAGS} ${LDAP_LDFLAGS}" + AGENT_LDFLAGS="${AGENT_LDFLAGS} ${LDAP_LDFLAGS}" + + found_iconv="no" + dnl Check for libiconv [by default - skip] +diff --git a/m4/ldap.m4 b/m4/ldap.m4 +index 29e97cd..885b3e0 100644 +--- a/m4/ldap.m4 ++++ b/m4/ldap.m4 +@@ -72,7 +72,8 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> + fi + + LDAP_CPPFLAGS=-I$LDAP_INCDIR +- LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap -llber $LDAP_LIBS" ++ LDAP_LDFLAGS="-L$LDAP_LIBDIR $LDAP_LIBS" ++ LDAP_LIBS="-lldap -llber $LDAP_LIBS" + + found_ldap="yes" + AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.]) +@@ -92,6 +93,7 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> + + AC_SUBST(LDAP_CPPFLAGS) + AC_SUBST(LDAP_LDFLAGS) ++ AC_SUBST(LDAP_LIBS) + + unset _libldap_with + ])dnl +-- +1.7.3.1 + +From f6378e6aeb0bec1883a83c70c8cdfd1213f11f97 Mon Sep 17 00:00:00 2001 +From: Vladimir V. Kamarzin +Date: Fri, 22 Oct 2010 17:49:16 +0600 +Subject: [PATCH 2/2] m4/ax_lib_postgresql.m4: move -pq from POSTGRESQL_LDFLAGS to POSTGRESQL_LIBS + +--- + m4/ax_lib_postgresql.m4 | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/m4/ax_lib_postgresql.m4 b/m4/ax_lib_postgresql.m4 +index fe06f66..934d12c 100644 +--- a/m4/ax_lib_postgresql.m4 ++++ b/m4/ax_lib_postgresql.m4 +@@ -84,7 +84,8 @@ AC_DEFUN([AX_LIB_POSTGRESQL], + AC_MSG_CHECKING([for PostgreSQL libraries]) + + POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" +- POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq" ++ POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" ++ POSTGRESQL_LIBS="-lpq" + + POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` + +@@ -179,4 +180,5 @@ PQserverVersion(conn); + AC_SUBST([POSTGRESQL_VERSION]) + AC_SUBST([POSTGRESQL_CPPFLAGS]) + AC_SUBST([POSTGRESQL_LDFLAGS]) ++ AC_SUBST([POSTGRESQL_LIBS]) + ]) +-- +1.7.3.1 + From 25c291329ef5acc174b8f4e0bd1e933341faf83a Mon Sep 17 00:00:00 2001 From: Matthias Drobny Date: Thu, 16 Oct 2014 09:41:18 +0200 Subject: [PATCH 7/8] Manifest --- net-analyzer/zabbix/Manifest | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index c50b986..82178fe 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -1,3 +1,42 @@ +AUX 1.4.6/init.d/zabbix-agentd 581 SHA256 5afaed3880c7f8d1a13d51d963f2758a0bc3ec982c667cc2aad9c84d44753452 SHA512 4d29435590d42374dc7428f09617ddbcc6e551850651f4d057a20b39689c041dcf3966b18efcec1c4478e44b9995ec3c55b1f3d3e27ba9ff5b96f0aef076da7a WHIRLPOOL 197096795bdb5387f62687b52894d86a10002a4e9bab11b28a71c3f0e575daebe6827d14b48983c9c0c3f49491a12751789ccc43e7e0e4e80ad60aac156eaf23 +AUX 1.4.6/init.d/zabbix-server 563 SHA256 8c2bc6b7dc1fb80e6b24536f7acb7ba102975b345da055cc19e33adfcdb95976 SHA512 897134b640ed2bd070fa3c29b9fdda368f6451179908fcd00aa2ee8710ea64556e6fcc1592e40a7050b323b56b67837004c1411c326ff4024f949089f980429b WHIRLPOOL e84983ddd78c29f76d8aed51b54f63db70a00637b6102cab065e36178c01f227770e19d999e0fae201ea266178221f40e141fb010f8171c787e2d78da6767372 +AUX 1.4.6/postinstall-en.txt 147 SHA256 3855cb33f7ca570a44e42d578894aba9ebe22fd2992f9f009ca954286f4ba38f SHA512 aa2dcda94d75c77a2369a45bc94011fb033589ed20230149e459658788d1cee5bf2fc80bdcec13702477dbff47639e1c6300e1f41ded134cad397333a1d3f329 WHIRLPOOL 33407c71a6fff74995761bdc59336dcd3835b6575ac6c84a534fae4e6ecbc2d364608bf249f71b0fde7c326eea16a064a00c1e3ca435f5898481212efcf67dab +AUX 1.4.6/zabbix_agent.conf 1119 SHA256 ba99099f1943d5cc86e29250d1040388d6b8af2e2e89423f1a681b6401399556 SHA512 248b59725d6a797233d8432e2049d26033f8b5444d66f57ad92064f6ead97afbb33277d55528b5fa2cf594b50c86838c2cec5a04ac401a5e21e45cf280198678 WHIRLPOOL 76cfe8ddae3f81520c04192180aded838f84e8fa710baa6bca803becac9be4190131513d1499f654850c513da9451c1a06f565bc255ee707babf7f350f78fa49 +AUX 1.4.6/zabbix_agentd.conf 2353 SHA256 73bb022dce06c40ae98833068599fb0d1854eafdbaef2098db2ecd223a0e5856 SHA512 606e49543d06d41d53d9712cea67dc5a4897cf0c6aa2047d25e21ac4ecd72a54466adfdba12f7d0bce185cc0c0fc6d6b26a0296ea9dc5ef66ba95a5d8cacc22e WHIRLPOOL 64eaeedf83c5270c4254b05598e15a62c3b5dded23f628620e3b2d7958f6d2c929219f5a964dbd36f818603b3467ad987038382212b97de0df9db07c128e09af +AUX 1.4.6/zabbix_server.conf 2443 SHA256 1075a5dc88e833f217b87a42ff83a27aa5f0d31ec8f48c466aa4d6588a33fba4 SHA512 3eb0c141360f4551e8d2c634656bbaa0b3559f96f2faee8de6d9a63b8c3829f5da0a9994036c655959724c6be1dafad3feaac8f2eadac650de7b4d0f5e4e0414 WHIRLPOOL 7adc9498744f1e9a7c708748e03164f170d75656efcf61162d7483f22ee8b660b82a1944ec27078bea1c762427f7b4398105d8999931e7b646a4516883e05e7b +AUX 1.6.5/init.d/zabbix-agentd 581 SHA256 7a38ede3531b862f723ff373f54fb89f713bd6bc007ac14ba97fb9c3b5977943 SHA512 c4b6ba851098cfb60ce15209d1cc8a27fd15fbee8131a81b78dc7f46bb12f90750960519b97183e3e2294bc6c9d9af3f8bd61d801804a6eae486efabf64f147c WHIRLPOOL 0a3665aa09ff6246730e949256b5397d8f10871f25dd0b9d7a029139de1995c983c79fa51de3b1555eff80cf285881302d608e43ba5eeaa75c2271a8960b250b +AUX 1.6.5/init.d/zabbix-server 563 SHA256 9bbbe65f6668cbb4c8691c96c487dbb016834d3e067c3fd26b94e2997b94cc30 SHA512 f55482938517fcb34f89c3518eea11a9fa3afa61d7c2d6edb8cb2ea24f4ef16fb70e9cc69edc4d0f3dca8c9198e655f7be43caaabf69fd624062ed2214149d38 WHIRLPOOL 68b3b79e3dfac61943db6ee9aa29926af21812dcf990f712ee40ab17bf7f5385de3a3981198d626b4a39b7fd7ff7afd75084a01ea6186c55eaba0ea313289b7b +AUX 1.6.5/postinstall-en.txt 147 SHA256 3855cb33f7ca570a44e42d578894aba9ebe22fd2992f9f009ca954286f4ba38f SHA512 aa2dcda94d75c77a2369a45bc94011fb033589ed20230149e459658788d1cee5bf2fc80bdcec13702477dbff47639e1c6300e1f41ded134cad397333a1d3f329 WHIRLPOOL 33407c71a6fff74995761bdc59336dcd3835b6575ac6c84a534fae4e6ecbc2d364608bf249f71b0fde7c326eea16a064a00c1e3ca435f5898481212efcf67dab +AUX 1.6.5/zabbix_agent.conf 1121 SHA256 0bbeabf0a3b9a7a3a2c71d384d785c9c1b9da420e1fb46445a15ce952d6c7790 SHA512 36ed992a7d14f89411180407fd1e06a49ba15317d9253adb77ec4b25aba5784e51488d72d3315ac68a179694a401e143aff7547551d8152b7425408bf75e4177 WHIRLPOOL da41ba48fddfbdaf4f79b18540aa0065cfca5d9dc1ef0ff004fd9ed4202f58682958527b69ebd21041730f280215e71d6fc6302186307212329dcdd5a88dda9a +AUX 1.6.5/zabbix_agentd.conf 2515 SHA256 7853fd3a22bdca6c05ff5326bf0d3f7d80cb3fe854c872a086f7f05484720f1f SHA512 fe8b727d4c00fd0393674c5d1266065563ab3ac51857d0aabeb243374c996b70df3119fe5a9d8f31ffe27b8d6a88c1b5d599de9fba2f14909f86cdde7a1c5746 WHIRLPOOL ae4b5dc398f9773ec8c536d7af7fe35dfb2f9894fc75561fa4eef56d0c57f47156773ac943000dbf2667878929cf436e1fd4ed478d61513eb53cbfdcc9723dff +AUX 1.6.5/zabbix_proxy.conf 4509 SHA256 d7f5d87f3ad9860b0dc8fe2175303b9e83464a5a0b51010a87a759f3b6de46e9 SHA512 3e472178bfbcb0d2b6065825bdcd6aeb45dba5b96e1e383042e51cb4a6a3ee6006788a8fd42f5766b4a5915488e7f925fbc599f371d64f7ebd33a31a3409754f WHIRLPOOL 94dd0131f19556f3881f8250c33284bad8a6a4b1d0bde1a0af43bdf00e27b154621504405fc6af059b747a8623419cb6c2e2f5055f934c2c6d8cc2d03b0ad974 +AUX 1.6.5/zabbix_server.conf 3922 SHA256 4210390a0400b86b090945abab6fdbfe91965d6746a46cf92434dacee4dfe3cb SHA512 71823a9ea9c5846064fae19342b279990131d3aecac71d6a4b72c88a26ee1750fe0ebb672ac1563fe0d1d06f483d3607472c4d95eb8b97e64f42700c588d9b49 WHIRLPOOL 677cac72f56bf1e9fbf522be883075bcac9d0922557560c4d4a53106ae71ad5f03f21f3bf93b6053a2fb1db048b95cff5ff05709768292a5a07df5c79df77e44 +AUX 1.6.5/zabbix_trapper.conf 755 SHA256 76af8f79fa28b02c65107753d959c5404faee67c28219e9bce1b29014fab3ca8 SHA512 d368c6f11e33cd21be20b35c3fe21060298ed11684bc7d5fe4b393fc9a5dd10b433bebf5ca0e250a998a0b496067471a4c2f5d0e90907e74e53c4e211e84897b WHIRLPOOL 6058172aceacfc0686a1ff45cc13b4f29c6433caaaa5be16053cb4f4137b2a86285f18a1936e984fd4745ba38a0d48873f821a65531041628d0ab6df7afd6569 +AUX 1.6.6/init.d/zabbix-agentd 581 SHA256 f85fa8c293623438d4df9abff3d2bbde0e4527a7062fe045643bebb69d047ffe SHA512 1642cef99e76b2739aaf8d05861fed0feb8c29bd2c796145d32c770d5455a57f6c8971b8024cb59f8fb53b58fc9d52c5959ce6701580b1833b5cc41547b51c19 WHIRLPOOL 7512f8dc9129c14885b59420625a4052189ab9caa13755372dd90ad0f1818e757c87934d08d38f751bd79eeff140285980e41acb7407ab39e0451bdbe4ee899c +AUX 1.6.6/init.d/zabbix-proxy 559 SHA256 d49339ebc7132815b1fa7411ca5aac395b65e10e4972cd743b5e3c3cdcaf9830 SHA512 ee05540c939150ada7450419cb43a08b0877448a9f5b10c1ad4c6cc95dcdf20dd2485c1074b2ff196290357d1b9559d94d8670daac1b9c81be1c5c9b0c4f1611 WHIRLPOOL 6a9de1086579a2780c6326ff340257de63cd4e4ae61fe8ca4054ffa8e730b0491f92f6500e73ebef6af9a335aee722b875097397f288a9904d866554470c7432 +AUX 1.6.6/init.d/zabbix-server 563 SHA256 95d06003e84fadef7470da4fa0c7ad42fc51dcc7c0eaab77546f43e916478ed5 SHA512 83e65819f6f7ed847e3a50baf5167dcd7e4c3e8c36bf642e9ef3c318bf6c95f1175e2108c1c3456785fc3c81fc64ca05a68492c2c7d769b85228a3a98be6abd9 WHIRLPOOL d1461c7f0a72e52ce910bd4541b62b4b140ff825db2949bddd2bf4bc6c511fe716899a503e43be3c79459cdacc181021a1ce06ef341ba12053e3ddceb5a593bf +AUX 1.6.6/postinstall-en.txt 147 SHA256 3855cb33f7ca570a44e42d578894aba9ebe22fd2992f9f009ca954286f4ba38f SHA512 aa2dcda94d75c77a2369a45bc94011fb033589ed20230149e459658788d1cee5bf2fc80bdcec13702477dbff47639e1c6300e1f41ded134cad397333a1d3f329 WHIRLPOOL 33407c71a6fff74995761bdc59336dcd3835b6575ac6c84a534fae4e6ecbc2d364608bf249f71b0fde7c326eea16a064a00c1e3ca435f5898481212efcf67dab +AUX 1.6.6/zabbix_agent.conf 1121 SHA256 0bbeabf0a3b9a7a3a2c71d384d785c9c1b9da420e1fb46445a15ce952d6c7790 SHA512 36ed992a7d14f89411180407fd1e06a49ba15317d9253adb77ec4b25aba5784e51488d72d3315ac68a179694a401e143aff7547551d8152b7425408bf75e4177 WHIRLPOOL da41ba48fddfbdaf4f79b18540aa0065cfca5d9dc1ef0ff004fd9ed4202f58682958527b69ebd21041730f280215e71d6fc6302186307212329dcdd5a88dda9a +AUX 1.6.6/zabbix_agentd.conf 2526 SHA256 78d16e30d210f7790797312462b3abf713125f7ca18f6ecb39e7458f6e9990ef SHA512 48dfa1f65106ea4dcd3a552736ac93366cbd7956f5cf331ab9f858623dee393bac48e61f58a1111954b342f312d059fe39e75bb64dce05c5a757201ce301a19e WHIRLPOOL fd598fc613d2b17bff0a920b5bcffc43e89fd54c6138ca534a220d073655d99777df5da98814bffc47d5b5380df4f97a685a66651211bd47666b12133ade1de8 +AUX 1.6.6/zabbix_proxy.conf 4539 SHA256 d2f96ffab6e88d3c6c54b39cc2b0b55dceb5d66d6a703489a30a88672edccdc4 SHA512 c305c650727e6293473981bf72e2163b4b9634d2486ab1ecf54cb40647852adfd91ec22707201774655a026b6b29f76c472c4b4da110cdd7c496ba9175f8c7a3 WHIRLPOOL 1a00f798d01e9fc9cd3d61a54936b820a7d41580e09c691ab2511e5323c8034585906ae547134e052436089fa24ccd1cb6bed6db350d3ab841206f5c6b81a73f +AUX 1.6.6/zabbix_server.conf 3945 SHA256 884ed1002a6f7130f90695f3e113efaf3c7ab82f3bf6c9a8f9e22e2f7025aff6 SHA512 61f1ee88ba1cf65c2e63362100b1466bbf669b5014c689626fc2d6b22cf87958c985d0a0291ccb576d2fbe2fac0eee4faf639fd526d64678db2c38bea0b993f8 WHIRLPOOL 453ac1046d7c8c85613ee5e663fc08c8944ab632d98471bd92a78aae4f6fba3e082b425cdc27e7af75cbab8dad14f02db4a5e253badbb6d6c15e58ae0dd25d41 +AUX 1.6.6/zabbix_trapper.conf 767 SHA256 10c94e2b4e93dfc67fa56156d5227ee91be68e7d8feb5a7d77b164dd1fbe86bc SHA512 4228b01eeca06596f0f662b8f2a85cc4d16acb81e3f07318ae9f7faa0b8fadba994caca1b75816e1fe131041fa0edac80f49834e5f0162634928bf8738b455bd WHIRLPOOL 1625e82a06d7b84e0a436688f8d56f9337481a98da816a7b61ae08f57687b7a18fba4645e27461aca1ff687fae345bc9ba4e23d309ef2c2709a3ae8cd743fb34 +AUX 2.0/init.d/zabbix-agentd 738 SHA256 8032cf57f85cb11a0ff5e25127cfc8c586c5ae8c2044cc300fb8fca6c8dbe712 SHA512 aca6f49258bfa82a239003854401c190150714f8caab8dcbd20f7ed00b4891e12670185647a5e8dce8ac82c2d997a7b9556a30174fab3322e06441fa1d30106b WHIRLPOOL 31d4a0eb42b19df33af8c9a6f022c9ecfa646a53bfd92d90167b22c5c5969194e2c07c2cb0794387c235120b452e341be91aacd84fc4d94ac953b64b7654d69f +AUX 2.0/init.d/zabbix-proxy 715 SHA256 bde2f3ab765969735114231e43b243303ab7f08859135eec1f8f0f03e2680276 SHA512 1505f08d47b6cca9ae197f778647e77752ad994e2c9fddd8edc77e77ede7e76be9d1983ad892c2fca61f65fc83ff54a3efabb7e85e0c8225845bed8e8abc01f0 WHIRLPOOL 4b1a85454d72d7952fa0c5d71e2d0829b5284bb8dfbedefff7ac7cb0eed40807e985f5cbedb4e8f9383bc31b1ef1c3175db29574f19e67ffa34f219981e5952d +AUX 2.0/init.d/zabbix-server 727 SHA256 2846405ed120c4ddaa41583ef7141fbb5b0f1ddc4761f4b6ef736943d794cdf4 SHA512 7cd93b3bc3593ffbd67f22989b8bfeef5d0b2a96def769f51c549740229a905daa69d1614ec2f89759803f3fab759a553d8122956be05d70d6182d439e2cf17c WHIRLPOOL 16cf2fcb54db348963d78e45c632f6274b2b2fcd40f8e4969b02028b20aab72638b20ca3da80da47369618b415bda5f44e7c6f7b7a3fad8fde5497ce19c358ea +AUX 2.0/patches/zbx282.patch 5556 SHA256 28334cdc8ee3dc6fc650dc55f2b9394d49c7a0355161ad8ef39c0529b75ad591 SHA512 7288c3ced5bfebe614fbe7d1d8ebe4d8af453b98908b73272fa4f3be7babc598dea2a51e4a26bdda1e665fb83c67b2a2b6bec030b18e3e998f51b1beaec3b7f0 WHIRLPOOL 8c6afb54b906dd4c7d317adf6a8cf602b2bb13344cb1e882636555b22c75854ca6f33cf69e2689b0d8c580e59e7dcf217c00c4bfb601a9b8416d1b4f5e134fe5 +AUX 2.0/patches/zbx6097.patch 2383 SHA256 93c882b46431fa4dd78c5e48b2f238bd2e24359e547b513d40e8bb6b808c81bd SHA512 2fd4445821981afd379d86a3cc541c5ba4e1f83497fbe4ee96daeafc17f1489fa731dc8400c3f73375f96180e015752f72daa088d0bc8b5406ba337a49d11be8 WHIRLPOOL 4d9fd7214b8f4d6107b31bb15b48d8f070c1c481ad999cda6836c251d3bf6dfdca397d1d1b25828d3c345d6aa61e7bd85060b37760fc3b54eda8f9bf3d2ae080 +AUX 2.0/patches/zbx7479.patch 2205 SHA256 f35da4e994a1b93885c0292f993a2e88457a712fe47d44282de3ee37b766dfb3 SHA512 1bad5a92528333d763960fba3031b2bda3e5751ff52a2e962837b3d86234a0e6ad812bfe93fc42f15e505f78000fad3f567cfb9469a6a4496b758b2f3a03f537 WHIRLPOOL ae073faae7390e67f78641a63fe4dc07c510a8dbe50779d9fcca9dace1b8090d777f6cd29d2d7dfbbd96c6d8c96985fc9988a03527c99e56838e5484a2869d39 +AUX 2.0/zabbix_proxy.conf 9979 SHA256 a1fe3728322abac55d3dc62ce1b3c86daa58c7c8c57da78ae04f7f2f11adfda6 SHA512 b1720c0b03f623ef74c58b9111a3f02d990fe3a04d7a2d58592501933387f908d4c7f856307ec83828b7406922101857eb3617dfb5443618237fc7ea81e8d8ef WHIRLPOOL 19e4aa0f704eee67e678531b0db8186359fd21a984a09c74b1761dcebe5ed6f0703f748cf188c63abb1d3232b7c49d8a4e6c27d6b6fe225bc2899465608ba61f +AUX 2.2/init.d/zabbix-agentd 730 SHA256 f60d80c937ef3a2fa0092a7948dbb644ab968a7d66ab0e44f1849b2e7ac35ed6 SHA512 523053ec80c43e3491a39478e8b4aaf8da17264fdcfb7d9dfecc03007f43266ba9d23c87119214de3d76834f9c664bd6f9c157b14fead040ead1760be30df7e8 WHIRLPOOL 6ac58565de163c5dda1837ecbac160a4ae484d718cd0797eff2a0fbe178ac285cfa4c984baf3fd5074fdd504a85f39a04c4fcfdb7c6202876d47f33eebd7d290 +AUX 2.2/init.d/zabbix-proxy 707 SHA256 123cad5312edc8060a8223d2400e77dbf5892762bc73284e4f6c010c3941e747 SHA512 28b4fea607b619357ac98d2a38929d1620d2db546c6024bd0c3f4c27693b83d074d2281128bb9db395c54f4e4bd14249b31683174dab605ee0dbee347691818f WHIRLPOOL 7e8077dbe3313ab4b8d216909f18acf2932e3c9d492b58d9da9340796e250d5052f76655ba59c360feaa2542aa01e0b902dca5f3f091d517cb3a2039ca1228ca +AUX 2.2/init.d/zabbix-server 719 SHA256 2a072cbc510e013dd99d8c428c81e19953765dfc9ba6ab0c6a847bf68ae7b8d5 SHA512 127c0ba1f378ad5dbe5761713bd12dddbe99da9434a0b9e2aa34f1c05b7f556178b359f090bd1f8f888eeaf4d7886d475f30a82c48a6122f26e42aa3dc7b519a WHIRLPOOL ddeb9b038f645da0bf72562a92caec96fe0327ed58268ae0f0388d12c1b773ad0811a1db8effd34f3047f86d4ce837f40fe6ed2597e6571de5f03e41a1f3aa66 +AUX 2.2/patches/zbx7479.patch 2148 SHA256 e19cf42dc6b5cef61240c94bd22938cac20f882214c9d464457a235c1c5213d9 SHA512 1acaddbdb9e2fa0f09703a8274db53fcb23b8ead3cf8b34f81bb2b38e65d576ccf4198a9504c255f3c6f2f900078e74341d9cf331af53aa697b0420ffccdde9a WHIRLPOOL 71b40b70eb806f14db495147498100bb9eddac6b1a76d841ba4251d1c3f8fa197f0a606f595758933de00c9c31a8b14f96a825da97e6e7e6ff0e045297fc2caa +AUX 2.2/patches/zbx8151.patch 2328 SHA256 43e671d964b1dd118f68e8d9ddd03980474da079a0c2287e4827501b9bed4b74 SHA512 f34c478241baf64739b8a2ae964a1c8d0f9e0d59963c8d8442e03b555e1f4d425dc90ab9491509c7e5c38e85ed8f3944c4626c7e2ca627a774219005bba6dba6 WHIRLPOOL 59aa4dc9b818460398bf86524235ad37814cd835b0b68b8faf11aae4c1439e5f02752750e0c9adc692fb033b026b2a2e6d9765f2f435fecdb721708d9d97ccb2 +AUX 2.2/zabbix_agent.conf 2138 SHA256 b3bc0b5facf5d55e50722ea109fbd3dd4757130f555ff6ecd4bd18ed8c795739 SHA512 7cfd6c1b1ec29b72a8d82f8d026cce2c6f56cd4c49d0a9f987193f812032dc26c814bd30f7ff115950dba1a8319d4e1bceebbdcc87f221e0fc34feb8c0264e56 WHIRLPOOL 84bf7e3421315157dff172060fc8d934dc05fa32ee393312be6ae10de5190dcd8749aabd724becf0c2d6eb530b385fbf6617b0288b0c141bd7cf446e7d356133 +AUX 2.2/zabbix_agentd.conf 7009 SHA256 4826f39a2f1f7a68ad51bd95afd68c6e3e4b0e41828ff1a39f20333b55ed88b9 SHA512 0474e31279c0cd0083468ec4f354176197bdd9ae7138f15dc19454537248b1218993ba6e79b292c4e526df6230104a5a40781fc44d618d4117ff72132424e699 WHIRLPOOL 019c42be344c410707f793bf17841ed01746e547aad9dc513b865b6c8a093f423210b38eacbbbc010e1a8e2f5f1da6ed86444c55f7d404dfab68fea65fa423cc +AUX 2.2/zabbix_proxy.conf 11353 SHA256 65f4a096489c0c5b416d7cceaed3d3e5ec922d0a74d257092806f72c5b368ab2 SHA512 35e278970a8ca2d1c2ba763d6a57eec4d05586c3eec9c2aa80c67d1eff1b78354dcf823161f03b06ade4c3f9616016a2fc653ea2686e7e0ea4ca00e1bab5e29b WHIRLPOOL 271e40754c3ac478a11ca770fd4c5bcff6148591a8aa6bf4ce8f07dbef6df73a5e5c486369264c6269c46868cbff6744dca2d9095385c43412844afb53fe8b5d +AUX 2.2/zabbix_server.conf 12145 SHA256 31f87d3f6f403dbb3b64bd841a0e2b16cbab388c73d46cf6984cf827431a4e66 SHA512 d53801446011d36ede4821207dd507b50d3b8ebc29d54f9a4d9bfc2814746c73b7fc43156a940c3bd154776cb1b358853727e931eff68a9d1fcd9549c10c6e77 WHIRLPOOL 461c96dbcfa272e8eccc7e2163ba7904bde7e4a88e9770f104bb172c771f7ff44c843241857198ba431fd91236070a5db64b57c3f628ec386b4ec1ce033f18e1 AUX 2.4/init.d/zabbix-agentd 730 SHA256 f60d80c937ef3a2fa0092a7948dbb644ab968a7d66ab0e44f1849b2e7ac35ed6 SHA512 523053ec80c43e3491a39478e8b4aaf8da17264fdcfb7d9dfecc03007f43266ba9d23c87119214de3d76834f9c664bd6f9c157b14fead040ead1760be30df7e8 WHIRLPOOL 6ac58565de163c5dda1837ecbac160a4ae484d718cd0797eff2a0fbe178ac285cfa4c984baf3fd5074fdd504a85f39a04c4fcfdb7c6202876d47f33eebd7d290 AUX 2.4/init.d/zabbix-proxy 707 SHA256 123cad5312edc8060a8223d2400e77dbf5892762bc73284e4f6c010c3941e747 SHA512 28b4fea607b619357ac98d2a38929d1620d2db546c6024bd0c3f4c27693b83d074d2281128bb9db395c54f4e4bd14249b31683174dab605ee0dbee347691818f WHIRLPOOL 7e8077dbe3313ab4b8d216909f18acf2932e3c9d492b58d9da9340796e250d5052f76655ba59c360feaa2542aa01e0b902dca5f3f091d517cb3a2039ca1228ca AUX 2.4/init.d/zabbix-server 719 SHA256 2a072cbc510e013dd99d8c428c81e19953765dfc9ba6ab0c6a847bf68ae7b8d5 SHA512 127c0ba1f378ad5dbe5761713bd12dddbe99da9434a0b9e2aa34f1c05b7f556178b359f090bd1f8f888eeaf4d7886d475f30a82c48a6122f26e42aa3dc7b519a WHIRLPOOL ddeb9b038f645da0bf72562a92caec96fe0327ed58268ae0f0388d12c1b773ad0811a1db8effd34f3047f86d4ce837f40fe6ed2597e6571de5f03e41a1f3aa66 @@ -6,6 +45,7 @@ AUX 2.4/zabbix_agentd.conf 7797 SHA256 4b7622c5615a140c59a9a70ba8355f26c1502fad9 AUX 2.4/zabbix_agentd.win.conf 7251 SHA256 f1ed583c909b821386fba11d854087c0f900c0b77b17d170c6b4cc71a7bacc0c SHA512 a215fab803eafd6ec15bd73087f38aa0c94b7a05e222647f417e0404f77222151749a1583fbbcb63b8a7a1b63a086a33f11724c4ccdc7c20863513a53fe7f5ac WHIRLPOOL a8552eecfd7289ebb7907ed9e6f8bf3658ceb24b6ccbdab08f43201dd207f7f990e5fb639f1890d71492f8eb22e5fc4b6290453955aeab203bdda86e1af238c5 AUX 2.4/zabbix_proxy.conf 12693 SHA256 c5783c7f81bd8c0e620dfbcaf207a268b81454e4ffef28dd9ee71a772f025a56 SHA512 8764e2dfe950ce1b5b237ac848ca8dacd4eb9f7baf8f868527c8b599dd0dbfdd381e26bb012e9f350e3c211611edc92e4685b44876a77fb5fe86a501713cc8eb WHIRLPOOL b7431df3624c97983d573b5dfc56be1de76e0f093310a42f46ac822218918ae3223b534688c4bff67f7e98f53416a8def5eea083e56a67f1908d0b3e30802cc0 AUX 2.4/zabbix_server.conf 13025 SHA256 3bbfdd3a2efb4db8d6fc7790ca9be1be47581a949d4ab437f1c809a7c362991d SHA512 2afd8d9d99d459ff41913e87a46eb29e191eab93a9b4a5b2e7822508c08f75e480b7306a5995981c4ed87fc2b3988f471680d28542d9b2ce3b4ce6cdb18b630a WHIRLPOOL 4e1e3baf7582c0ebcb13161485d8210e2db00a7cb341a2cf23ae72f0d86accb4820619be27e14e8b5980c5f1c8a13559dfdbc08fb97c880ee480db95fe146237 +AUX zabbix-1.8.9-as-needed.patch 2737 SHA256 1c9b85c0a9d9161f983a590df387341c5168f254deb9f2cf858886a2e6e8aec1 SHA512 9ba379e8088697f26f29ac31f2c5e8cad8e0709993285afe9e390f63150ec09fab46089e3f29f2d6a818bf55042c39646ce19840498355fd6df43b1834c6078d WHIRLPOOL bc4728cf9e14284b91b45627090e45d39f53a721ba46d9379418d650d22732994bec11046d64d0f0136932d4f4e2f0c29de68f527db9d9f765f0245f1d39288f AUX zabbix-agentd.service 254 SHA256 0cb3dce6c208d1bdcc9f258bf04904932a30e4a3ab6e45aa6b3a687fb807d3e3 SHA512 f740ef1f6f698eab0ebe894ba726b7a4b35379974c3f5dda26c43c6360f0b8f86f2846c085befe485ced6345fd39e67fe221ce9f08955896e4ccb5561e124c01 WHIRLPOOL fd3421c1197652b47393df3e6f25d2fbff0e7cf0419b518c6f3a23a0ef31f42123694826971253affb07daabdb4e70eb983d7fc560da80c8d05f0189a9fe8af5 AUX zabbix-agentd.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39 AUX zabbix-proxy.service 244 SHA256 e0b65f25da5d4db20b50a62a50802f6692181365d43a09e59af906f78a1ccfef SHA512 450bc0ccd110fb012c31e43fc1dd92604255f7577dabce49e67b36f80ef73a1ddfd967e9ca7ccd37dc13e5ac50e0c45bf924999f4e3c7b13ddd284f89f076bad WHIRLPOOL 4b16647b07b30e59d2baa4b53a767154cf06d181813fda92df03f1fa11737abb4070f065f743fde34fa45a2dae614131420c07d61bb3390e1a696625967e09d2 From db28ebc79dda14e211e1ff046b99deaa940108cf Mon Sep 17 00:00:00 2001 From: Matthias Drobny Date: Thu, 16 Oct 2014 10:49:16 +0200 Subject: [PATCH 8/8] php.ini changes --- net-analyzer/zabbix/Manifest | 2 +- net-analyzer/zabbix/zabbix-2.4.1.ebuild | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 82178fe..3cff112 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -53,6 +53,6 @@ AUX zabbix-proxy.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1 AUX zabbix-server.service 281 SHA256 53465d624fc5cd4d00586119234c2d3d763b63a2721f9410392cb77f73db4a74 SHA512 b002e8efdc58300fc06ed1e1028f64d525dfaff52d74e661dbb4da3750b785d817d2bdff96f4ea3a28545fda4e37df962ec7a28b70868cc4b50b63ea27b088ff WHIRLPOOL caf2ef91caf33b517623e5c4e81bf635886d5199ec1f33389dee33cbb2d13c78d54911daac2d1af317d0b2b32d361424a961d7530a690d30f3d0089fb96e4808 AUX zabbix-server.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39 DIST zabbix-2.4.1.tar.gz 14730972 SHA256 e47b328c2babcc7c37b27c96732b5f6ac28a935901acf8a3d340887ba64bece4 SHA512 8cf19262503ade91188cc6a9653fd2f13c966cc2638b9c36f1ecfb989707fc991cfa3bfa487b0c8a230caa6e344105a4494fd3981d8b09c07048842369e71dc2 WHIRLPOOL 5907ef1eb71c175879e93be7151a1c313a5a90d05ffdd1a2189beb22133fa08d24fb72749e0e9a13fa7a6a5b3eb0470d0331e05cd15e2f77ffdb616d5aaf24ec -EBUILD zabbix-2.4.1.ebuild 10177 SHA256 fc15fa7334812230ff4739f633e4553de8b219fc1b7ae16fa780f796276b1606 SHA512 35367070a01ef0b5bbb94bba1ad85c2a6fd41e759a3ed431d12ea8742ae2a572781f1704c61db0d7e697abb45bf50c534e797f5222ec60e16540893954b37309 WHIRLPOOL ed979699c41905e5aae733afc7cdb4722f94cb5561ebc53fca8d30e57af7ff88a4383e75b3138c199a193022d028ef3d23d0b04b69011fbac034d4d395701e08 +EBUILD zabbix-2.4.1.ebuild 10708 SHA256 d7741539ad070ab447044b6723d3cf3df7e090faaa8e87cfaca3b9d86bf99317 SHA512 8873b869dfbfd94daada922cf2c105c1c1b8a15664b181d49c41d8abe1e9f2e3a34277133c2e4330006049d12776d085b2490ab8d3e7b38bfc68a0aeb8118623 WHIRLPOOL e58855215ea628cac6d26057f1deab8be367c297227418e4ec01442846cc1c884c2108ea4ecae5005ba6155cf5e2c2f2767b85b0c2423dd158c444e314904b2f MISC ChangeLog 38192 SHA256 ab3ae5d2bbc07db9b986e109ab9f17e888ea96246bfdd091063f96c760546ec9 SHA512 73ec2d31906aebf07a05edf0184dfaa964ed41249f7e05ec093c137ea1151cc44248591216c55b6360e7fdebfc1627d58918648b6408c96bf1d9f6bca8e5978b WHIRLPOOL 645a94821eefa0cffcf58208f7eebeac6491030dca8bb7ddd6e6bdbc6681f3299e5259efba86856d12de92bf014f91cfaefc0f249ad2d21537a175c56a3b959e MISC metadata.xml 1221 SHA256 94d1841cf3efb9a709dbc9ee160a29c394a1c0f5af5069fe1466f9f08796c72d SHA512 3d3ed8e75fcd9f521402a9734d5bd19c163a7a5d33cef3b20b6e476416fc352a91a62782ecc0ed032efbafd5f07f6ac08e28a88fb766095a1bba146f8f50b5e5 WHIRLPOOL ae2d69cab99c364721ca2e806fc5e02d1dbe72ad48bea43b4d1a0fd49c00cc2b94ea6ea85f4f5a9ff90522a90ade17fe816fe85ca7a16e755d02239d4426da92 diff --git a/net-analyzer/zabbix/zabbix-2.4.1.ebuild b/net-analyzer/zabbix/zabbix-2.4.1.ebuild index 3ab9a91..d8de051 100644 --- a/net-analyzer/zabbix/zabbix-2.4.1.ebuild +++ b/net-analyzer/zabbix/zabbix-2.4.1.ebuild @@ -203,6 +203,20 @@ pkg_postinst() { ;; esac fi + + if use server; then + PHPVER=`eselect php list apache2 | grep "*" | cut -d \ -f 6` + elog + elog "Alter current php.ini to match Zabbix requirements:" + elog "post_max_size = 16M" + elog "max_execution_time = 300" + elog "max_input_time = 300" + elog + cat /etc/php/apache2-${PHPVER}/php.ini | \ + sed 's/^post_max_size\ =\ .*$/post_max_size\ =\ 16M/g' | \ + sed 's/^max_execution_time\ =\ .*$/max_execution_time\ =\ 300/g' | \ + sed 's/^max_input_time\ =\ .*$/max_input_time\ =\ 300/g' > /etc/php/apache2-${PHPVER}/php.ini + fi } src_configure() {