From a0d85d11ff1535340a2c27851f7cf648a76b8f02 Mon Sep 17 00:00:00 2001 From: Marc Schiffbauer Date: Sun, 11 Apr 2021 22:40:31 -0500 Subject: net-analyzer/zabbix: clean ebuild Signed-off-by: Marc Schiffbauer --- net-analyzer/zabbix/Manifest | 20 - net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd | 29 -- net-analyzer/zabbix/files/2.4/init.d/zabbix-proxy | 28 -- net-analyzer/zabbix/files/2.4/init.d/zabbix-server | 27 - .../zabbix/files/2.4/patches/zbx7479.patch | 83 ---- .../zabbix/files/2.4/patches/zbx8151.patch | 53 -- net-analyzer/zabbix/files/2.4/zabbix_agent.conf | 81 --- net-analyzer/zabbix/files/2.4/zabbix_agentd.conf | 278 ----------- net-analyzer/zabbix/files/2.4/zabbix_proxy.conf | 519 -------------------- net-analyzer/zabbix/files/2.4/zabbix_server.conf | 546 --------------------- net-analyzer/zabbix/files/Manifest | 7 - .../zabbix/files/zabbix-1.8.9-as-needed.patch | 83 ---- 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 - net-analyzer/zabbix/metadata.xml | 34 -- net-analyzer/zabbix/zabbix-2.4.8.ebuild | 342 ------------- 20 files changed, 2175 deletions(-) delete mode 100644 net-analyzer/zabbix/Manifest delete mode 100644 net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd delete mode 100644 net-analyzer/zabbix/files/2.4/init.d/zabbix-proxy delete mode 100644 net-analyzer/zabbix/files/2.4/init.d/zabbix-server delete mode 100644 net-analyzer/zabbix/files/2.4/patches/zbx7479.patch delete mode 100644 net-analyzer/zabbix/files/2.4/patches/zbx8151.patch delete mode 100644 net-analyzer/zabbix/files/2.4/zabbix_agent.conf delete mode 100644 net-analyzer/zabbix/files/2.4/zabbix_agentd.conf delete mode 100644 net-analyzer/zabbix/files/2.4/zabbix_proxy.conf delete mode 100644 net-analyzer/zabbix/files/2.4/zabbix_server.conf delete mode 100644 net-analyzer/zabbix/files/Manifest delete mode 100644 net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch delete mode 100644 net-analyzer/zabbix/files/zabbix-agentd.service delete mode 100644 net-analyzer/zabbix/files/zabbix-agentd.tmpfiles delete mode 100644 net-analyzer/zabbix/files/zabbix-proxy.service delete mode 100644 net-analyzer/zabbix/files/zabbix-proxy.tmpfiles delete mode 100644 net-analyzer/zabbix/files/zabbix-server.service delete mode 100644 net-analyzer/zabbix/files/zabbix-server.tmpfiles delete mode 100644 net-analyzer/zabbix/metadata.xml delete mode 100644 net-analyzer/zabbix/zabbix-2.4.8.ebuild diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest deleted file mode 100644 index e250891..0000000 --- a/net-analyzer/zabbix/Manifest +++ /dev/null @@ -1,20 +0,0 @@ -AUX 2.4/init.d/zabbix-agentd 614 SHA256 8f8667a1c1ee207e517779afba78d448547fdfc239979236bfd5c70108546dc9 SHA512 6dd7b72825488d96ad42fd18666f65fa3d2daffe51d8d4cc945b8c70557227a8d365033b8f2cda1c221a39171c64b288b89929946e1cb179b9780ec2d43c96d7 WHIRLPOOL b3355a21d2625b5c9384ebcad04a3f68e47df84e9d74aaf98d9ff7150e527a01dccb72d6fb1dda642904770ee3e5b2999d84bc2034110ed8a9138febb30f7058 -AUX 2.4/init.d/zabbix-proxy 592 SHA256 0732f3c0e49fc96dacc4d80c5882529df697188bb05e025270753d029f66cc3d SHA512 69562657bc0be6fb841b840f7e8d65622d56dc0f42b4f1071144b75adbbe628d6103f4aff7c5c9ab1b81c1426935d6bf818cda2f9cf6b4ec593a54905fe47157 WHIRLPOOL aedc09723287ec04161f071972b409e5f134613b3d57c8a76f28adb84bfb52e68bfd520d307d757b62944d814781a1a5fc27840ba934c46b5b3cdb08143213a4 -AUX 2.4/init.d/zabbix-server 603 SHA256 eb8a9e358cc6a0e86751cef6293bb190712c7b7abda14d07504042adf5d70004 SHA512 322192876583e8c75bf0dde7d9f83a44d7086590ce7a51e77fc76a7884ced0d8d8707270de4ecd3c35ef072ba23ea89b66807ee6165922e19cc7eea6ba2770f7 WHIRLPOOL 74969e685c051857dc882baa4e653bf8dc327292dfd7ed7b2c91be01bc5b8c8e5d9b7dd4efb601542ad4b8a87f0cdbb26210e4b076a05f77e581bf626bcbb727 -AUX 2.4/patches/zbx7479.patch 2148 SHA256 e19cf42dc6b5cef61240c94bd22938cac20f882214c9d464457a235c1c5213d9 SHA512 1acaddbdb9e2fa0f09703a8274db53fcb23b8ead3cf8b34f81bb2b38e65d576ccf4198a9504c255f3c6f2f900078e74341d9cf331af53aa697b0420ffccdde9a WHIRLPOOL 71b40b70eb806f14db495147498100bb9eddac6b1a76d841ba4251d1c3f8fa197f0a606f595758933de00c9c31a8b14f96a825da97e6e7e6ff0e045297fc2caa -AUX 2.4/patches/zbx8151.patch 2328 SHA256 43e671d964b1dd118f68e8d9ddd03980474da079a0c2287e4827501b9bed4b74 SHA512 f34c478241baf64739b8a2ae964a1c8d0f9e0d59963c8d8442e03b555e1f4d425dc90ab9491509c7e5c38e85ed8f3944c4626c7e2ca627a774219005bba6dba6 WHIRLPOOL 59aa4dc9b818460398bf86524235ad37814cd835b0b68b8faf11aae4c1439e5f02752750e0c9adc692fb033b026b2a2e6d9765f2f435fecdb721708d9d97ccb2 -AUX 2.4/zabbix_agent.conf 2138 SHA256 b3bc0b5facf5d55e50722ea109fbd3dd4757130f555ff6ecd4bd18ed8c795739 SHA512 7cfd6c1b1ec29b72a8d82f8d026cce2c6f56cd4c49d0a9f987193f812032dc26c814bd30f7ff115950dba1a8319d4e1bceebbdcc87f221e0fc34feb8c0264e56 WHIRLPOOL 84bf7e3421315157dff172060fc8d934dc05fa32ee393312be6ae10de5190dcd8749aabd724becf0c2d6eb530b385fbf6617b0288b0c141bd7cf446e7d356133 -AUX 2.4/zabbix_agentd.conf 7009 SHA256 4826f39a2f1f7a68ad51bd95afd68c6e3e4b0e41828ff1a39f20333b55ed88b9 SHA512 0474e31279c0cd0083468ec4f354176197bdd9ae7138f15dc19454537248b1218993ba6e79b292c4e526df6230104a5a40781fc44d618d4117ff72132424e699 WHIRLPOOL 019c42be344c410707f793bf17841ed01746e547aad9dc513b865b6c8a093f423210b38eacbbbc010e1a8e2f5f1da6ed86444c55f7d404dfab68fea65fa423cc -AUX 2.4/zabbix_proxy.conf 11353 SHA256 65f4a096489c0c5b416d7cceaed3d3e5ec922d0a74d257092806f72c5b368ab2 SHA512 35e278970a8ca2d1c2ba763d6a57eec4d05586c3eec9c2aa80c67d1eff1b78354dcf823161f03b06ade4c3f9616016a2fc653ea2686e7e0ea4ca00e1bab5e29b WHIRLPOOL 271e40754c3ac478a11ca770fd4c5bcff6148591a8aa6bf4ce8f07dbef6df73a5e5c486369264c6269c46868cbff6744dca2d9095385c43412844afb53fe8b5d -AUX 2.4/zabbix_server.conf 12145 SHA256 31f87d3f6f403dbb3b64bd841a0e2b16cbab388c73d46cf6984cf827431a4e66 SHA512 d53801446011d36ede4821207dd507b50d3b8ebc29d54f9a4d9bfc2814746c73b7fc43156a940c3bd154776cb1b358853727e931eff68a9d1fcd9549c10c6e77 WHIRLPOOL 461c96dbcfa272e8eccc7e2163ba7904bde7e4a88e9770f104bb172c771f7ff44c843241857198ba431fd91236070a5db64b57c3f628ec386b4ec1ce033f18e1 -AUX Manifest 2652 SHA256 3e4c300ba9a502dd85c8e653c209db4f4f978eae3924a60d0f19cf0bee654824 SHA512 8f43ca17c154171766e36d61cc13eaa309af1b4905479e03aad9757486c9fff374f7f655306f4fc44697daedbe4ef6f62c7f2a557fb93b1f3c282a0200da2c07 WHIRLPOOL a2d83a162e9360bafc523c383a0b921157d79c46647f6cd24f5f9214048d9011ed38f68ca211a5c615814bb44a2d7e43bdda154a77198ce97c028b01d0166037 -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 -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.8.tar.gz 15474481 SHA256 073f7498ff7c07e51f3395dbd850b375144d6a41388409d898bb2826b0a3e1f0 SHA512 bf0816279f771448076bd8d8f1efe65651e24964b402ba128aace3d5afc0333f808a9d48b5763e334a05bc9f53fa934d81cc1b90072a0e9ba74b29205ab2b300 WHIRLPOOL 3e9da427680c3686820f3fb59bcac11614dea77ab577fd34fa339283b886306e94e4a3b73d5c966a8610e8d24992158b5f0ee3e3c2428152c1b7b92eb529d729 -EBUILD zabbix-2.4.8.ebuild 9420 SHA256 e9dd3673aa101be695cf0e4e16e1a5bff510063b7d43a26ff98c2907b148e1c7 SHA512 008a419d89c7c0fbd76c11038e12db59a1fb5e271f7a8fa00b089f6fb43c38a218ca3affdf9013aa62e3af6745f35b875da0e8841c86493033720c54c54ba551 WHIRLPOOL 6a540a2d6527c3541f41d2fb089b247aa717d536b86b77e18527503aeb1d1b01551598b6cbb5350e4b4d8b0188c5edf64bd3840d007d08a7a3181d241d90ccac -MISC metadata.xml 1457 SHA256 02e152e5dcf7776653722e547c0e6976ab3040afa03b1a4b26f8637bbc219844 SHA512 b3a37c6835295143d5b782cce4c165be76d81e929329da4d8bcf8f26e893ea74414c9274e40475cede63a11f526edbe7e97309995c46ba8d19787a256b2a84a6 WHIRLPOOL 8d73e30ac920c7aac20b2aec789af7515e1209488d0b0b1ec3601130d00be68f7056392f4d3e9466966c443786fe7717cb5c24066ec79eb550ca0b201cbf4b1b diff --git a/net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd deleted file mode 100644 index e1e17b0..0000000 --- a/net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 deleted file mode 100644 index e048c18..0000000 --- a/net-analyzer/zabbix/files/2.4/init.d/zabbix-proxy +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 deleted file mode 100644 index f75996d..0000000 --- a/net-analyzer/zabbix/files/2.4/init.d/zabbix-server +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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/patches/zbx7479.patch b/net-analyzer/zabbix/files/2.4/patches/zbx7479.patch deleted file mode 100644 index 79bb92f..0000000 --- a/net-analyzer/zabbix/files/2.4/patches/zbx7479.patch +++ /dev/null @@ -1,83 +0,0 @@ -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.4/patches/zbx8151.patch b/net-analyzer/zabbix/files/2.4/patches/zbx8151.patch deleted file mode 100644 index 076e10a..0000000 --- a/net-analyzer/zabbix/files/2.4/patches/zbx8151.patch +++ /dev/null @@ -1,53 +0,0 @@ -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.4/zabbix_agent.conf b/net-analyzer/zabbix/files/2.4/zabbix_agent.conf deleted file mode 100644 index dcb4b72..0000000 --- a/net-analyzer/zabbix/files/2.4/zabbix_agent.conf +++ /dev/null @@ -1,81 +0,0 @@ -# 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.4/zabbix_agentd.conf b/net-analyzer/zabbix/files/2.4/zabbix_agentd.conf deleted file mode 100644 index 4d49d36..0000000 --- a/net-analyzer/zabbix/files/2.4/zabbix_agentd.conf +++ /dev/null @@ -1,278 +0,0 @@ -# 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.4/zabbix_proxy.conf b/net-analyzer/zabbix/files/2.4/zabbix_proxy.conf deleted file mode 100644 index d4bae2e..0000000 --- a/net-analyzer/zabbix/files/2.4/zabbix_proxy.conf +++ /dev/null @@ -1,519 +0,0 @@ -# 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.4/zabbix_server.conf b/net-analyzer/zabbix/files/2.4/zabbix_server.conf deleted file mode 100644 index caba019..0000000 --- a/net-analyzer/zabbix/files/2.4/zabbix_server.conf +++ /dev/null @@ -1,546 +0,0 @@ -# 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/Manifest b/net-analyzer/zabbix/files/Manifest deleted file mode 100644 index 48e200a..0000000 --- a/net-analyzer/zabbix/files/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -MISC zabbix-1.8.9-as-needed.patch 2737 SHA256 1c9b85c0a9d9161f983a590df387341c5168f254deb9f2cf858886a2e6e8aec1 SHA512 9ba379e8088697f26f29ac31f2c5e8cad8e0709993285afe9e390f63150ec09fab46089e3f29f2d6a818bf55042c39646ce19840498355fd6df43b1834c6078d WHIRLPOOL bc4728cf9e14284b91b45627090e45d39f53a721ba46d9379418d650d22732994bec11046d64d0f0136932d4f4e2f0c29de68f527db9d9f765f0245f1d39288f -MISC zabbix-agentd.service 254 SHA256 0cb3dce6c208d1bdcc9f258bf04904932a30e4a3ab6e45aa6b3a687fb807d3e3 SHA512 f740ef1f6f698eab0ebe894ba726b7a4b35379974c3f5dda26c43c6360f0b8f86f2846c085befe485ced6345fd39e67fe221ce9f08955896e4ccb5561e124c01 WHIRLPOOL fd3421c1197652b47393df3e6f25d2fbff0e7cf0419b518c6f3a23a0ef31f42123694826971253affb07daabdb4e70eb983d7fc560da80c8d05f0189a9fe8af5 -MISC zabbix-agentd.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39 -MISC zabbix-proxy.service 244 SHA256 e0b65f25da5d4db20b50a62a50802f6692181365d43a09e59af906f78a1ccfef SHA512 450bc0ccd110fb012c31e43fc1dd92604255f7577dabce49e67b36f80ef73a1ddfd967e9ca7ccd37dc13e5ac50e0c45bf924999f4e3c7b13ddd284f89f076bad WHIRLPOOL 4b16647b07b30e59d2baa4b53a767154cf06d181813fda92df03f1fa11737abb4070f065f743fde34fa45a2dae614131420c07d61bb3390e1a696625967e09d2 -MISC zabbix-proxy.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39 -MISC zabbix-server.service 281 SHA256 53465d624fc5cd4d00586119234c2d3d763b63a2721f9410392cb77f73db4a74 SHA512 b002e8efdc58300fc06ed1e1028f64d525dfaff52d74e661dbb4da3750b785d817d2bdff96f4ea3a28545fda4e37df962ec7a28b70868cc4b50b63ea27b088ff WHIRLPOOL caf2ef91caf33b517623e5c4e81bf635886d5199ec1f33389dee33cbb2d13c78d54911daac2d1af317d0b2b32d361424a961d7530a690d30f3d0089fb96e4808 -MISC zabbix-server.tmpfiles 35 SHA256 d0516a64ad0841dac41faf0ca709ff16405346f1e9d1bcb00dcffe37ac6b689b SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df WHIRLPOOL f8a3202aa65ecdf733cd8f9208c294dd2086d4de11682c01bd18f7122b0c3d2e1e3da4775020beca68f5bb9be8e14f57c50b0c18ecbad3c2c23237d3572e3b39 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 deleted file mode 100644 index 254634d..0000000 --- a/net-analyzer/zabbix/files/zabbix-1.8.9-as-needed.patch +++ /dev/null @@ -1,83 +0,0 @@ -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 - diff --git a/net-analyzer/zabbix/files/zabbix-agentd.service b/net-analyzer/zabbix/files/zabbix-agentd.service deleted file mode 100644 index 8485d06..0000000 --- a/net-analyzer/zabbix/files/zabbix-agentd.service +++ /dev/null @@ -1,14 +0,0 @@ -[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 deleted file mode 100644 index 56471bb..0000000 --- a/net-analyzer/zabbix/files/zabbix-agentd.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/zabbix 0755 zabbix zabbix - diff --git a/net-analyzer/zabbix/files/zabbix-proxy.service b/net-analyzer/zabbix/files/zabbix-proxy.service deleted file mode 100644 index 85ecd79..0000000 --- a/net-analyzer/zabbix/files/zabbix-proxy.service +++ /dev/null @@ -1,14 +0,0 @@ -[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 deleted file mode 100644 index 56471bb..0000000 --- a/net-analyzer/zabbix/files/zabbix-proxy.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/zabbix 0755 zabbix zabbix - diff --git a/net-analyzer/zabbix/files/zabbix-server.service b/net-analyzer/zabbix/files/zabbix-server.service deleted file mode 100644 index 3ea9733..0000000 --- a/net-analyzer/zabbix/files/zabbix-server.service +++ /dev/null @@ -1,14 +0,0 @@ -[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 deleted file mode 100644 index 56471bb..0000000 --- a/net-analyzer/zabbix/files/zabbix-server.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/zabbix 0755 zabbix zabbix - diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml deleted file mode 100644 index d1e8bfb..0000000 --- a/net-analyzer/zabbix/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - patrick@gentoo.org - Patrick Lauer - - - alicef@gentoo.org - Alice Ferrazzi - - -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 - - - prdownloads - - diff --git a/net-analyzer/zabbix/zabbix-2.4.8.ebuild b/net-analyzer/zabbix/zabbix-2.4.8.ebuild deleted file mode 100644 index 85599b2..0000000 --- a/net-analyzer/zabbix/zabbix-2.4.8.ebuild +++ /dev/null @@ -1,342 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp 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 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - static? ( !oracle !snmp )" - -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:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping ) - server? ( net-analyzer/fping - app-admin/webapp-config ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - 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] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2[static-libs] ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - 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 - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - default -} - -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 xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - || die "econf failed" -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" - fi -} - -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.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 - 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.4"/init.d/zabbix-proxy - dosbin \ - src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins \ - "${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" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins \ - "${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 - 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_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/android-json-4.3_r3.1.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 -} - -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 - - 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 -} -- cgit v1.2.3-65-gdbad