The following diff updates zabbix to 3.2.3, released Dec 21 2016. Biggest changes wrt to 3.0.x
- finally close problems manually (no more .nodata(xx) needed) - finally export/import web scenarios - tag events - easier to understand trigger hysteresis - more vm monitoring items More info: https://www.zabbix.com/documentation/3.2/manual/introduction/whatsnew320 The diff below: - adds libxml for vm monitoring - makes sensors work again...(they were broken due to a failed check in configure script) - remove obsolete zabbix_agent.conf Index: Makefile =================================================================== RCS file: /cvs/ports/net/zabbix/Makefile,v retrieving revision 1.126 diff -u -p -r1.126 Makefile --- Makefile 4 Nov 2016 11:35:20 -0000 1.126 +++ Makefile 21 Dec 2016 08:47:37 -0000 @@ -4,7 +4,7 @@ COMMENT-main = network and application COMMENT-server = network and application monitoring - server COMMENT-web = network and application monitoring - web frontend -VERSION = 3.0.4 +VERSION = 3.2.3 DISTNAME = zabbix-${VERSION} FULLPKGNAME-main = zabbix-agent-${VERSION} FULLPKGPATH-main = net/zabbix,-main @@ -12,7 +12,6 @@ PKGNAME-server = zabbix-server-${VERSION FULLPKGNAME-web = zabbix-web-${VERSION} FULLPKGPATH-web = net/zabbix,-web CATEGORIES = net -REVISION = 1 MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -45,12 +44,14 @@ LIB_DEPENDS = converters/libiconv \ RUN_DEPENDS-main = LIB_DEPENDS-server = ${LIB_DEPENDS} \ + textproc/libxml \ net/net-snmp \ textproc/iksemel RUN_DEPENDS-server = net/fping # we want the _zabbix user&group as well as README-main RUN_DEPENDS-server += net/zabbix,-main>=${VERSION} -WANTLIB-server = ${WANTLIB} crypto ssl z netsnmp iksemel pthread +WANTLIB-server = ${WANTLIB} crypto ssl z netsnmp iksemel pthread \ + xml2 CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --enable-server \ @@ -58,6 +59,7 @@ CONFIGURE_ARGS = --enable-server \ --enable-proxy \ --enable-ipv6 \ --with-libcurl \ + --with-libxml2 \ --with-net-snmp \ --with-ldap \ --with-jabber="${LOCALBASE}" Index: distinfo =================================================================== RCS file: /cvs/ports/net/zabbix/distinfo,v retrieving revision 1.37 diff -u -p -r1.37 distinfo --- distinfo 1 Sep 2016 15:32:47 -0000 1.37 +++ distinfo 21 Dec 2016 08:47:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (zabbix-3.0.4.tar.gz) = n6R9l4Q7bKn1UNcGtA7ms1t2xRZf8y/xHvBHTxYedwA= -SIZE (zabbix-3.0.4.tar.gz) = 15403727 +SHA256 (zabbix-3.2.3.tar.gz) = 5tunQDnY1u//huw9qZkJ9Nrq62bUh4G7tmbjCUUz2iU= +SIZE (zabbix-3.2.3.tar.gz) = 15922416 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/net/zabbix/patches/patch-configure,v retrieving revision 1.18 diff -u -p -r1.18 patch-configure --- patches/patch-configure 7 Jul 2016 18:47:33 -0000 1.18 +++ patches/patch-configure 21 Dec 2016 08:47:37 -0000 @@ -1,7 +1,15 @@ $OpenBSD: patch-configure,v 1.18 2016/07/07 18:47:33 robert Exp $ ---- configure.orig Wed May 18 15:08:43 2016 -+++ configure Fri Jun 24 16:09:28 2016 -@@ -9202,7 +9202,7 @@ $as_echo "yes" >&6; } +--- configure.orig Wed Dec 7 11:08:07 2016 ++++ configure Tue Dec 20 08:43:21 2016 +@@ -6313,6 +6313,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + #include <stdlib.h> + #include <sys/queue.h> ++#include <sys/select.h> + #include <sys/sensors.h> + int + main () +@@ -9205,7 +9206,7 @@ $as_echo "yes" >&6; } JABBER_INCDIR="$IKSEMEL_CPPFLAGS" JABBER_LIBDIR="$IKSEMEL_LDFLAGS" @@ -10,7 +18,7 @@ $OpenBSD: patch-configure,v 1.18 2016/07 fi else -@@ -9212,7 +9212,7 @@ $as_echo_n "checking for iksemel support... " >&6; } +@@ -9215,7 +9216,7 @@ $as_echo_n "checking for iksemel support... " >&6; } if test -f $_libiksemel_with/include/iksemel.h; then JABBER_INCDIR="-I$_libiksemel_with/include" JABBER_LIBDIR="-L$_libiksemel_with/lib" Index: patches/patch-src_libs_zbxsysinfo_openbsd_net_c =================================================================== RCS file: /cvs/ports/net/zabbix/patches/patch-src_libs_zbxsysinfo_openbsd_net_c,v retrieving revision 1.6 diff -u -p -r1.6 patch-src_libs_zbxsysinfo_openbsd_net_c --- patches/patch-src_libs_zbxsysinfo_openbsd_net_c 9 Dec 2015 17:43:36 -0000 1.6 +++ patches/patch-src_libs_zbxsysinfo_openbsd_net_c 21 Dec 2016 08:47:37 -0000 @@ -2,23 +2,17 @@ $OpenBSD: patch-src_libs_zbxsysinfo_open Stop using struct ifnet and libkvm for interface stats. ---- src/libs/zbxsysinfo/openbsd/net.c.orig Mon Aug 10 10:56:48 2015 -+++ src/libs/zbxsysinfo/openbsd/net.c Wed Dec 9 18:41:03 2015 -@@ -24,13 +24,8 @@ +--- src/libs/zbxsysinfo/openbsd/net.c.orig Fri Sep 30 11:42:54 2016 ++++ src/libs/zbxsysinfo/openbsd/net.c Tue Nov 22 10:12:32 2016 +@@ -35,7 +35,6 @@ - #include <sys/sockio.h> - --#if OpenBSD >= 201405 --# include <net/if_var.h> /* structs ifnet and ifnet_head are defined in this header since OpenBSD 5.5 */ --#endif -- static struct nlist kernel_symbols[] = { - {"_ifnet", N_UNDF, 0, 0, 0}, {"_tcbtable", N_UNDF, 0, 0, 0}, {NULL, 0, 0, 0, 0} }; -@@ -43,11 +38,6 @@ static int get_ifdata(const char *if_name, +@@ -48,11 +47,6 @@ static int get_ifdata(const char *if_name, zbx_uint64_t *tbytes, zbx_uint64_t *tpackets, zbx_uint64_t *terrors, zbx_uint64_t *icollisions, char **error) { @@ -30,7 +24,7 @@ Stop using struct ifnet and libkvm for i int ret = SYSINFO_RET_FAIL; if (NULL == if_name || '\0' == *if_name) -@@ -88,66 +78,7 @@ static int get_ifdata(const char *if_name, +@@ -93,66 +87,7 @@ static int get_ifdata(const char *if_name, if (icollisions) *icollisions = 0; Index: patches/patch-src_zabbix_server_server_c =================================================================== RCS file: /cvs/ports/net/zabbix/patches/patch-src_zabbix_server_server_c,v retrieving revision 1.6 diff -u -p -r1.6 patch-src_zabbix_server_server_c --- patches/patch-src_zabbix_server_server_c 7 Jul 2016 18:47:33 -0000 1.6 +++ patches/patch-src_zabbix_server_server_c 21 Dec 2016 08:47:37 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_zabbix_server_server_c,v 1.6 2016/07/07 18:47:33 robert Exp $ ---- src/zabbix_server/server.c.orig Fri Jun 24 16:13:52 2016 -+++ src/zabbix_server/server.c Fri Jun 24 16:13:57 2016 -@@ -59,7 +59,7 @@ +--- src/zabbix_server/server.c.orig Wed Dec 7 11:07:54 2016 ++++ src/zabbix_server/server.c Tue Dec 20 08:18:48 2016 +@@ -60,7 +60,7 @@ #include "setproctitle.h" #include "../libs/zbxcrypto/tls.h" Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/net/zabbix/pkg/PLIST-main,v retrieving revision 1.11 diff -u -p -r1.11 PLIST-main --- pkg/PLIST-main 7 Jul 2016 18:47:33 -0000 1.11 +++ pkg/PLIST-main 21 Dec 2016 08:47:37 -0000 @@ -14,11 +14,6 @@ @bin sbin/zabbix_agentd share/examples/zabbix/ @sample ${SYSCONFDIR}/zabbix/ -@mode 640 -@group _zabbix -@sample ${SYSCONFDIR}/zabbix/zabbix_agent.conf -@mode -@group share/examples/zabbix/zabbix_agentd.conf @mode 640 @group _zabbix Index: pkg/PLIST-server =================================================================== RCS file: /cvs/ports/net/zabbix/pkg/PLIST-server,v retrieving revision 1.16 diff -u -p -r1.16 PLIST-server --- pkg/PLIST-server 5 Apr 2015 10:22:49 -0000 1.16 +++ pkg/PLIST-server 21 Dec 2016 08:47:37 -0000 @@ -19,7 +19,6 @@ share/examples/zabbix/zabbix_server.conf @mode @group share/zabbix/ -share/zabbix/alertscripts/ share/zabbix/data/ share/zabbix/data/images/ share/zabbix/dbpatches/ @@ -54,7 +53,6 @@ share/zabbix/dbpatches/2.0/postgresql/pa share/zabbix/dbpatches/2.0/postgresql/rc4_rc5.sql share/zabbix/dbpatches/2.2/ share/zabbix/dbpatches/2.2/README -share/zabbix/externalscripts/ share/zabbix/schema/ share/zabbix/schema/mysql/ share/zabbix/schema/mysql/data.sql Index: pkg/PLIST-web =================================================================== RCS file: /cvs/ports/net/zabbix/pkg/PLIST-web,v retrieving revision 1.28 diff -u -p -r1.28 PLIST-web --- pkg/PLIST-web 7 Jul 2016 18:47:33 -0000 1.28 +++ pkg/PLIST-web 21 Dec 2016 08:47:38 -0000 @@ -37,6 +37,7 @@ zabbix/app/controllers/CControllerMediat zabbix/app/controllers/CControllerMediatypeEnable.php zabbix/app/controllers/CControllerMediatypeList.php zabbix/app/controllers/CControllerMediatypeUpdate.php +zabbix/app/controllers/CControllerProblemView.php zabbix/app/controllers/CControllerProfileUpdate.php zabbix/app/controllers/CControllerProxyCreate.php zabbix/app/controllers/CControllerProxyDelete.php @@ -70,6 +71,7 @@ zabbix/app/views/administration.proxy.li zabbix/app/views/administration.script.edit.js.php zabbix/app/views/administration.script.edit.php zabbix/app/views/administration.script.list.php +zabbix/app/views/layout.csv.php zabbix/app/views/layout.htmlpage.footer.php zabbix/app/views/layout.htmlpage.header.php zabbix/app/views/layout.htmlpage.menu.php @@ -83,6 +85,8 @@ zabbix/app/views/monitoring.acknowledge. zabbix/app/views/monitoring.dashboard.view.php zabbix/app/views/monitoring.discovery.view.php zabbix/app/views/monitoring.map.view.php +zabbix/app/views/monitoring.problem.view.js.php +zabbix/app/views/monitoring.problem.view.php zabbix/app/views/monitoring.web.view.php zabbix/app/views/monitoring.widget.discovery.view.php zabbix/app/views/monitoring.widget.hosts.view.php @@ -126,10 +130,10 @@ zabbix/conf/zabbix.conf.php.example @sample zabbix/conf/zabbix.conf.php @mode @group +zabbix/correlation.php zabbix/dashconf.php zabbix/disc_prototypes.php zabbix/discoveryconf.php -zabbix/events.php zabbix/favicon.ico zabbix/fonts/ zabbix/fonts/DejaVuSans.ttf @@ -193,6 +197,7 @@ zabbix/include/classes/api/services/CAct zabbix/include/classes/api/services/CAlert.php zabbix/include/classes/api/services/CApplication.php zabbix/include/classes/api/services/CConfiguration.php +zabbix/include/classes/api/services/CCorrelation.php zabbix/include/classes/api/services/CDCheck.php zabbix/include/classes/api/services/CDHost.php zabbix/include/classes/api/services/CDRule.php @@ -220,6 +225,7 @@ zabbix/include/classes/api/services/CMai zabbix/include/classes/api/services/CMap.php zabbix/include/classes/api/services/CMapElement.php zabbix/include/classes/api/services/CMediatype.php +zabbix/include/classes/api/services/CProblem.php zabbix/include/classes/api/services/CProxy.php zabbix/include/classes/api/services/CScreen.php zabbix/include/classes/api/services/CScreenItem.php @@ -363,6 +369,7 @@ zabbix/include/classes/import/converters zabbix/include/classes/import/converters/C20ImportConverter.php zabbix/include/classes/import/converters/C20ItemKeyConverter.php zabbix/include/classes/import/converters/C20TriggerConverter.php +zabbix/include/classes/import/converters/C30ImportConverter.php zabbix/include/classes/import/converters/CConverter.php zabbix/include/classes/import/converters/CConverterChain.php zabbix/include/classes/import/converters/CImportConverterFactory.php @@ -383,6 +390,7 @@ zabbix/include/classes/import/validators zabbix/include/classes/import/validators/C10XmlValidator.php zabbix/include/classes/import/validators/C20XmlValidator.php zabbix/include/classes/import/validators/C30XmlValidator.php +zabbix/include/classes/import/validators/C32XmlValidator.php zabbix/include/classes/import/validators/CXmlValidator.php zabbix/include/classes/import/validators/CXmlValidatorGeneral.php zabbix/include/classes/items/ @@ -413,9 +421,11 @@ zabbix/include/classes/parsers/CFunction zabbix/include/classes/parsers/CItemDelayFlexParser.php zabbix/include/classes/parsers/CItemKey.php zabbix/include/classes/parsers/CLLDMacroParser.php +zabbix/include/classes/parsers/CMacroFunctionParser.php zabbix/include/classes/parsers/CMacroParser.php zabbix/include/classes/parsers/CParser.php zabbix/include/classes/parsers/CReferenceParser.php +zabbix/include/classes/parsers/CReplacementParser.php zabbix/include/classes/parsers/CSetParser.php zabbix/include/classes/parsers/CTriggerExpression.php zabbix/include/classes/parsers/CUserMacroParser.php @@ -442,12 +452,14 @@ zabbix/include/classes/screens/CScreenHi zabbix/include/classes/screens/CScreenHostTriggers.php zabbix/include/classes/screens/CScreenHostgroupTriggers.php zabbix/include/classes/screens/CScreenHostsInfo.php +zabbix/include/classes/screens/CScreenHttpTest.php zabbix/include/classes/screens/CScreenHttpTestDetails.php zabbix/include/classes/screens/CScreenLldGraph.php zabbix/include/classes/screens/CScreenLldGraphBase.php zabbix/include/classes/screens/CScreenLldSimpleGraph.php zabbix/include/classes/screens/CScreenMap.php zabbix/include/classes/screens/CScreenPlainText.php +zabbix/include/classes/screens/CScreenProblem.php zabbix/include/classes/screens/CScreenScreen.php zabbix/include/classes/screens/CScreenServerInfo.php zabbix/include/classes/screens/CScreenSimpleGraph.php @@ -498,6 +510,7 @@ zabbix/include/classes/validators/event/ zabbix/include/classes/validators/host/ zabbix/include/classes/validators/host/CHostNormalValidator.php zabbix/include/classes/validators/hostgroup/ +zabbix/include/classes/validators/hostgroup/CHostGroupNameValidator.php zabbix/include/classes/validators/hostgroup/CHostGroupNormalValidator.php zabbix/include/classes/validators/object/ zabbix/include/classes/validators/object/CConditionValidator.php @@ -508,6 +521,7 @@ zabbix/include/classes/validators/schema zabbix/include/classes/validators/string/ zabbix/include/classes/validators/string/CLldMacroStringValidator.php zabbix/include/config.inc.php +zabbix/include/correlation.inc.php zabbix/include/db.inc.php zabbix/include/debug.inc.php zabbix/include/defines.inc.php @@ -574,6 +588,8 @@ zabbix/include/views/configuration.actio zabbix/include/views/configuration.application.edit.php zabbix/include/views/configuration.application.list.php zabbix/include/views/configuration.copy.elements.php +zabbix/include/views/configuration.correlation.edit.php +zabbix/include/views/configuration.correlation.list.php zabbix/include/views/configuration.discovery.edit.php zabbix/include/views/configuration.discovery.list.php zabbix/include/views/configuration.graph.edit.php @@ -602,6 +618,7 @@ zabbix/include/views/configuration.servi zabbix/include/views/configuration.services.list.php zabbix/include/views/configuration.services.parent.list.php zabbix/include/views/configuration.template.edit.php +zabbix/include/views/configuration.template.list.php zabbix/include/views/configuration.trigger.prototype.edit.php zabbix/include/views/configuration.trigger.prototype.list.php zabbix/include/views/configuration.trigger.prototype.massupdate.php @@ -631,6 +648,7 @@ zabbix/include/views/js/common.init.js.p zabbix/include/views/js/common.item.edit.js.php zabbix/include/views/js/conf.import.js.php zabbix/include/views/js/configuration.action.edit.js.php +zabbix/include/views/js/configuration.correlation.edit.js.php zabbix/include/views/js/configuration.discovery.edit.js.php zabbix/include/views/js/configuration.graph.edit.js.php zabbix/include/views/js/configuration.host.discovery.edit.js.php @@ -761,6 +779,10 @@ zabbix/locale/fr/ zabbix/locale/fr/LC_MESSAGES/ zabbix/locale/fr/LC_MESSAGES/frontend.mo zabbix/locale/fr/LC_MESSAGES/frontend.po +zabbix/locale/he/ +zabbix/locale/he/LC_MESSAGES/ +zabbix/locale/he/LC_MESSAGES/frontend.mo +zabbix/locale/he/LC_MESSAGES/frontend.po zabbix/locale/hu/ zabbix/locale/hu/LC_MESSAGES/ zabbix/locale/hu/LC_MESSAGES/frontend.mo @@ -854,7 +876,6 @@ zabbix/overview.php zabbix/popup.php zabbix/popup_httpstep.php zabbix/popup_media.php -zabbix/popup_right.php zabbix/popup_trexpr.php zabbix/popup_usrgrp.php zabbix/profile.php -- Mark Patruck ( mark at wrapped.cx ) GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51 http://www.wrapped.cx
