update zabbix to 5.0.1

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

update zabbix to 5.0.1

Robert Nagy
Hi

The following diff takes us to zabbix 5.0 LTS, but this will require some more
widespread testing, so I am sharing the diff here first before I commit it.

Please run with it and share the results.

Thanks

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.165
diff -u -p -u -r1.165 Makefile
--- Makefile 15 Apr 2020 05:58:12 -0000 1.165
+++ Makefile 30 May 2020 08:49:40 -0000
@@ -5,7 +5,7 @@ COMMENT-server = network and application
 COMMENT-proxy = network and application monitoring - proxy
 COMMENT-web = network and application monitoring - web frontend
 
-VERSION = 4.0.19
+VERSION = 5.0.1
 DISTNAME = zabbix-${VERSION}
 FULLPKGNAME-main = zabbix-agent-${VERSION}
 FULLPKGPATH-main = net/zabbix,-main
@@ -16,9 +16,6 @@ FULLPKGNAME-web = zabbix-web-${VERSION}
 FULLPKGPATH-web = net/zabbix,-web
 CATEGORIES = net
 
-REVISION-proxy = 0
-REVISION-server = 0
-
 MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
 HOMEPAGE = http://www.zabbix.com/
@@ -28,7 +25,7 @@ MAINTAINER = Robert Nagy <robert@openbs
 # GPLv2
 PERMIT_PACKAGE = Yes
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=zabbix/}
+MASTER_SITES = https://cdn.zabbix.com/zabbix/sources/stable/${MAJV}/
 
 MODULES= lang/php
 MODPHP_BUILDDEP = No
@@ -40,7 +37,7 @@ FLAVORS = mysql pgsql sqlite3
 SUBST_VARS += PREFIX-web ZABBIX_WEB MAJV
 
 WANTLIB = c iconv kvm m execinfo lber ldap crypto ssl z \
- curl nghttp2 pcre
+ curl nghttp2 pcre pthread
 
 LIB_DEPENDS = converters/libiconv \
  databases/openldap \
@@ -53,12 +50,11 @@ RUN_DEPENDS-main =
 LIB_DEPENDS-server = ${LIB_DEPENDS} \
  textproc/libxml \
  net/net-snmp \
- textproc/iksemel \
  security/libssh2
 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 \
  xml2 ssh2
 
 CONFIGURE_STYLE = gnu
@@ -77,6 +73,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE
  LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" \
  ac_cv_search___res_query=no
 
+MAKE_ENV = GOCACHE=${WRKDIST}/go-cache
+
 PREFIX-web = ${VARBASE}/www
 LIB_DEPENDS-web =
 RUN_DEPENDS-web = ${MODPHP_RUN_DEPENDS} \
@@ -88,7 +86,7 @@ LIB_DEPENDS-proxy = ${LIB_DEPENDS} \
  net/net-snmp \
  security/libssh2 \
  textproc/libxml
-WANTLIB-proxy = ${WANTLIB} netsnmp ssh2 xml2 pthread
+WANTLIB-proxy = ${WANTLIB} netsnmp ssh2 xml2
 RUN_DEPENDS-proxy = # empty
 
 FLAVOR ?= no_server
@@ -105,14 +103,14 @@ MULTI_PACKAGES += -proxy -server
 LIB_DEPENDS-proxy += databases/mariadb,-main
 LIB_DEPENDS-server += databases/mariadb,-main
 CONFIGURE_ARGS += --with-mysql
-WANTLIB-proxy += mysqlclient pthread
-WANTLIB-server += event mysqlclient
+WANTLIB-proxy += event mariadb pthread
+WANTLIB-server += event mariadb
 .elif ${BACKEND} == "pgsql"
 MULTI_PACKAGES += -proxy -server
 LIB_DEPENDS-proxy += databases/postgresql,-main
 LIB_DEPENDS-server += databases/postgresql,-main
 CONFIGURE_ARGS += --with-postgresql
-WANTLIB-proxy += pq
+WANTLIB-proxy += event pq
 WANTLIB-server += event pq
 .elif ${BACKEND} == "sqlite3"
 MULTI_PACKAGES += -proxy
@@ -121,7 +119,7 @@ CONFIGURE_ARGS += --with-sqlite3 \
 # The proxy does not use jabber, so just disable the check
 CONFIGURE_ARGS += --without-jabber
 
-WANTLIB-proxy += sqlite3
+WANTLIB-proxy += event sqlite3
 LIB_DEPENDS-proxy += databases/sqlite3
 .elif ${BACKEND} == "no_server"
 CONFIGURE_ARGS += --disable-server \
@@ -138,7 +136,7 @@ pre-configure:
 
 post-install:
  ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX-web}/zabbix
- cd ${WRKBUILD}/frontends/php && tar -cf - . | \
+ cd ${WRKBUILD}/ui && tar -cf - . | \
  tar -C ${DESTDIR}${PREFIX-web}/zabbix -xf -
  ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zabbix
  ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX-web}/conf/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/zabbix/distinfo,v
retrieving revision 1.50
diff -u -p -u -r1.50 distinfo
--- distinfo 14 Apr 2020 14:47:24 -0000 1.50
+++ distinfo 30 May 2020 08:49:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (zabbix-4.0.19.tar.gz) = eU3rOFY7aqvZlSBlRN0ecIZ0N+X7xEhRcO23FoHaUTM=
-SIZE (zabbix-4.0.19.tar.gz) = 17211769
+SHA256 (zabbix-5.0.1.tar.gz) = IKGeXPI1T/y74kUhsEvs/Jh15XKJwA2nGZneYMSoU7Y=
+SIZE (zabbix-5.0.1.tar.gz) = 18623104
Index: patches/patch-conf_zabbix_proxy_conf
===================================================================
RCS file: /cvs/ports/net/zabbix/patches/patch-conf_zabbix_proxy_conf,v
retrieving revision 1.9
diff -u -p -u -r1.9 patch-conf_zabbix_proxy_conf
--- patches/patch-conf_zabbix_proxy_conf 26 Oct 2018 06:57:21 -0000 1.9
+++ patches/patch-conf_zabbix_proxy_conf 30 May 2020 08:49:40 -0000
@@ -29,7 +29,7 @@ Index: conf/zabbix_proxy.conf
 
  # Option: DBPort
  # Database port when not using local socket. Ignored for SQLite.
-@@ -504,6 +505,7 @@ Timeout=4
+@@ -513,6 +514,7 @@ Timeout=4
  # Mandatory: no
  # Default:
  # ExternalScripts=${datadir}/zabbix/externalscripts
@@ -37,7 +37,7 @@ Index: conf/zabbix_proxy.conf
 
  ### Option: FpingLocation
  # Location of fping.
-@@ -512,6 +514,7 @@ Timeout=4
+@@ -521,6 +523,7 @@ Timeout=4
  # Mandatory: no
  # Default:
  # FpingLocation=/usr/sbin/fping
@@ -45,7 +45,7 @@ Index: conf/zabbix_proxy.conf
 
  ### Option: Fping6Location
  # Location of fping6.
-@@ -521,6 +524,7 @@ Timeout=4
+@@ -530,6 +533,7 @@ Timeout=4
  # Mandatory: no
  # Default:
  # Fping6Location=/usr/sbin/fping6
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/zabbix/patches/patch-configure,v
retrieving revision 1.27
diff -u -p -u -r1.27 patch-configure
--- patches/patch-configure 14 Apr 2020 14:47:25 -0000 1.27
+++ patches/patch-configure 30 May 2020 08:49:40 -0000
@@ -1,8 +1,9 @@
-$OpenBSD: patch-configure,v 1.27 2020/04/14 14:47:25 robert Exp $
+$OpenBSD$
+
 Index: configure
 --- configure.orig
 +++ configure
-@@ -6538,6 +6538,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6517,6 +6517,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
  #include <stdlib.h>
  #include <sys/queue.h>
@@ -10,34 +11,18 @@ Index: configure
  #include <sys/sensors.h>
  int
  main ()
-@@ -9540,7 +9541,7 @@ $as_echo "yes" >&6; }
-
- JABBER_INCDIR="$IKSEMEL_CPPFLAGS"
- JABBER_LIBDIR="$IKSEMEL_LDFLAGS"
-- JABBER_LIBS="-liksemel"
-+ JABBER_LIBS="-liksemel -lpthread"
-
- fi
-        else
-@@ -9550,7 +9551,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"
--                       JABBER_LIBS="-liksemel"
-+                       JABBER_LIBS="-liksemel -lpthread"
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-                else
-@@ -14395,12 +14396,12 @@ LIBS="$LIBS $ICONV_LIBS"
+@@ -14150,13 +14151,13 @@ LIBS="$LIBS $ICONV_LIBS"
  RANLIB="ranlib"
 
 
 -SERVER_CONFIG_FILE="${sysconfdir}/zabbix_server.conf"
 -PROXY_CONFIG_FILE="${sysconfdir}/zabbix_proxy.conf"
 -AGENT_CONFIG_FILE="${sysconfdir}/zabbix_agentd.conf"
+-AGENT2_CONFIG_FILE="${sysconfdir}/zabbix_agent2.conf"
 +SERVER_CONFIG_FILE="${sysconfdir}/zabbix/zabbix_server.conf"
 +PROXY_CONFIG_FILE="${sysconfdir}/zabbix/zabbix_proxy.conf"
 +AGENT_CONFIG_FILE="${sysconfdir}/zabbix/zabbix_agentd.conf"
++AGENT2_CONFIG_FILE="${sysconfdir}/zabbix/zabbix_agent2.conf"
 
 -EXTERNAL_SCRIPTS_PATH="${datadir}/zabbix/externalscripts"
 -ALERT_SCRIPTS_PATH="${datadir}/zabbix/alertscripts"
Index: patches/patch-src_libs_zbxnix_daemon_c
===================================================================
RCS file: /cvs/ports/net/zabbix/patches/patch-src_libs_zbxnix_daemon_c,v
retrieving revision 1.13
diff -u -p -u -r1.13 patch-src_libs_zbxnix_daemon_c
--- patches/patch-src_libs_zbxnix_daemon_c 19 Aug 2019 13:36:29 -0000 1.13
+++ patches/patch-src_libs_zbxnix_daemon_c 30 May 2020 08:49:40 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_libs_zbxnix_daemon_c
 Index: src/libs/zbxnix/daemon.c
 --- src/libs/zbxnix/daemon.c.orig
 +++ src/libs/zbxnix/daemon.c
-@@ -301,7 +301,7 @@ int daemon_start(int allow_root, const char *user, uns
+@@ -308,7 +308,7 @@ int daemon_start(int allow_root, const char *user, uns
  if (0 == allow_root && 0 == getuid()) /* running as root? */
  {
  if (NULL == user)
Index: patches/patch-src_zabbix_agent_cpustat_c
===================================================================
RCS file: /cvs/ports/net/zabbix/patches/patch-src_zabbix_agent_cpustat_c,v
retrieving revision 1.5
diff -u -p -u -r1.5 patch-src_zabbix_agent_cpustat_c
--- patches/patch-src_zabbix_agent_cpustat_c 3 Feb 2020 19:13:41 -0000 1.5
+++ patches/patch-src_zabbix_agent_cpustat_c 30 May 2020 08:49:40 -0000
@@ -5,7 +5,7 @@ Add ZBX_CPU_STATE_SPIN to monitor CP_SPI
 Index: src/zabbix_agent/cpustat.c
 --- src/zabbix_agent/cpustat.c.orig
 +++ src/zabbix_agent/cpustat.c
-@@ -639,6 +639,7 @@ read_again:
+@@ -636,6 +636,7 @@ read_again:
  counter[ZBX_CPU_STATE_NICE] = (zbx_uint64_t)all_states[CP_NICE];
  counter[ZBX_CPU_STATE_SYSTEM] = (zbx_uint64_t)all_states[CP_SYS];
  counter[ZBX_CPU_STATE_INTERRUPT] = (zbx_uint64_t)all_states[CP_INTR];
@@ -13,7 +13,7 @@ Index: src/zabbix_agent/cpustat.c
  counter[ZBX_CPU_STATE_IDLE] = (zbx_uint64_t)all_states[CP_IDLE];
  }
  else
-@@ -659,6 +660,7 @@ read_again:
+@@ -656,6 +657,7 @@ read_again:
  counter[ZBX_CPU_STATE_NICE] = (zbx_uint64_t)one_states[CP_NICE];
  counter[ZBX_CPU_STATE_SYSTEM] = (zbx_uint64_t)one_states[CP_SYS];
  counter[ZBX_CPU_STATE_INTERRUPT] = (zbx_uint64_t)one_states[CP_INTR];
Index: pkg/PLIST-proxy
===================================================================
RCS file: /cvs/ports/net/zabbix/pkg/PLIST-proxy,v
retrieving revision 1.5
diff -u -p -u -r1.5 PLIST-proxy
--- pkg/PLIST-proxy 15 Apr 2020 05:58:12 -0000 1.5
+++ pkg/PLIST-proxy 30 May 2020 08:49:40 -0000
@@ -12,14 +12,26 @@ share/examples/zabbix/zabbix_proxy.conf
 share/zabbix-proxy/
 share/zabbix-proxy/schema/
 share/zabbix-proxy/schema/mysql/
-share/zabbix-proxy/schema/mysql/data.sql
-share/zabbix-proxy/schema/mysql/images.sql
-share/zabbix-proxy/schema/mysql/schema.sql
-share/zabbix-proxy/schema/postgresql/
-share/zabbix-proxy/schema/postgresql/data.sql
-share/zabbix-proxy/schema/postgresql/images.sql
-share/zabbix-proxy/schema/postgresql/schema.sql
+@comment share/zabbix-server/schema/mysql/Makefile
+@comment share/zabbix-server/schema/mysql/Makefile.am
+@comment share/zabbix-server/schema/mysql/Makefile.in
+share/zabbix-server/schema/mysql/data.sql
+share/zabbix-server/schema/mysql/double.sql
+share/zabbix-server/schema/mysql/images.sql
+share/zabbix-server/schema/mysql/schema.sql
+share/zabbix-server/schema/postgresql/
+@comment share/zabbix-server/schema/postgresql/Makefile
+@comment share/zabbix-server/schema/postgresql/Makefile.am
+@comment share/zabbix-server/schema/postgresql/Makefile.in
+share/zabbix-server/schema/postgresql/data.sql
+share/zabbix-server/schema/postgresql/double.sql
+share/zabbix-server/schema/postgresql/images.sql
+share/zabbix-server/schema/postgresql/schema.sql
+share/zabbix-server/schema/postgresql/timescaledb.sql
 share/zabbix-proxy/schema/sqlite3/
+@comment share/zabbix-proxy/schema/sqlite3/Makefile
+@comment share/zabbix-proxy/schema/sqlite3/Makefile.am
+@comment share/zabbix-proxy/schema/sqlite3/Makefile.in
 share/zabbix-proxy/schema/sqlite3/data.sql
 share/zabbix-proxy/schema/sqlite3/images.sql
 share/zabbix-proxy/schema/sqlite3/schema.sql
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/net/zabbix/pkg/PLIST-server,v
retrieving revision 1.23
diff -u -p -u -r1.23 PLIST-server
--- pkg/PLIST-server 15 Apr 2020 05:58:12 -0000 1.23
+++ pkg/PLIST-server 30 May 2020 08:49:40 -0000
@@ -14,14 +14,22 @@ share/examples/zabbix/zabbix_server.conf
 @group
 share/zabbix-server/
 share/zabbix-server/schema/
-share/zabbix-server/schema/mysql/
+@comment share/zabbix-server/schema/mysql/Makefile
+@comment share/zabbix-server/schema/mysql/Makefile.am
+@comment share/zabbix-server/schema/mysql/Makefile.in
 share/zabbix-server/schema/mysql/data.sql
+share/zabbix-server/schema/mysql/double.sql
 share/zabbix-server/schema/mysql/images.sql
 share/zabbix-server/schema/mysql/schema.sql
 share/zabbix-server/schema/postgresql/
+@comment share/zabbix-server/schema/postgresql/Makefile
+@comment share/zabbix-server/schema/postgresql/Makefile.am
+@comment share/zabbix-server/schema/postgresql/Makefile.in
 share/zabbix-server/schema/postgresql/data.sql
+share/zabbix-server/schema/postgresql/double.sql
 share/zabbix-server/schema/postgresql/images.sql
 share/zabbix-server/schema/postgresql/schema.sql
+share/zabbix-server/schema/postgresql/timescaledb.sql
 @mode 0755
 @owner _zabbix
 @sample /var/log/zabbix/
Index: pkg/PLIST-web
===================================================================
RCS file: /cvs/ports/net/zabbix/pkg/PLIST-web,v
retrieving revision 1.38
diff -u -p -u -r1.38 PLIST-web
--- pkg/PLIST-web 3 Feb 2020 19:13:41 -0000 1.38
+++ pkg/PLIST-web 30 May 2020 08:49:40 -0000
@@ -5,25 +5,18 @@
 conf/modules.sample/zabbix.conf
 zabbix/
 zabbix/actionconf.php
-zabbix/adm.gui.php
-zabbix/adm.housekeeper.php
-zabbix/adm.iconmapping.php
-zabbix/adm.images.php
-zabbix/adm.macros.php
-zabbix/adm.other.php
-zabbix/adm.regexps.php
-zabbix/adm.triggerdisplayoptions.php
-zabbix/adm.triggerseverities.php
-zabbix/adm.valuemapping.php
-zabbix/adm.workingtime.php
 zabbix/api_jsonrpc.php
 zabbix/app/
 zabbix/app/.htaccess
 zabbix/app/controllers/
-zabbix/app/controllers/CControllerAcknowledgeCreate.php
-zabbix/app/controllers/CControllerAcknowledgeEdit.php
+zabbix/app/controllers/CControllerAuditLogList.php
 zabbix/app/controllers/CControllerAuthenticationEdit.php
 zabbix/app/controllers/CControllerAuthenticationUpdate.php
+zabbix/app/controllers/CControllerAutoregEdit.php
+zabbix/app/controllers/CControllerAutoregUpdate.php
+zabbix/app/controllers/CControllerCharts.php
+zabbix/app/controllers/CControllerChartsView.php
+zabbix/app/controllers/CControllerChartsViewJson.php
 zabbix/app/controllers/CControllerDashboardAbstract.php
 zabbix/app/controllers/CControllerDashboardDelete.php
 zabbix/app/controllers/CControllerDashboardList.php
@@ -34,12 +27,37 @@ zabbix/app/controllers/CControllerDashbo
 zabbix/app/controllers/CControllerDashboardUpdate.php
 zabbix/app/controllers/CControllerDashboardView.php
 zabbix/app/controllers/CControllerDashboardWidgetCheck.php
+zabbix/app/controllers/CControllerDashboardWidgetConfigure.php
 zabbix/app/controllers/CControllerDashboardWidgetEdit.php
 zabbix/app/controllers/CControllerDashboardWidgetRfRate.php
+zabbix/app/controllers/CControllerDashboardWidgetSanitize.php
 zabbix/app/controllers/CControllerDiscoveryView.php
 zabbix/app/controllers/CControllerExportXml.php
 zabbix/app/controllers/CControllerFavouriteCreate.php
 zabbix/app/controllers/CControllerFavouriteDelete.php
+zabbix/app/controllers/CControllerGuiEdit.php
+zabbix/app/controllers/CControllerGuiUpdate.php
+zabbix/app/controllers/CControllerHost.php
+zabbix/app/controllers/CControllerHostMacrosList.php
+zabbix/app/controllers/CControllerHostView.php
+zabbix/app/controllers/CControllerHostViewRefresh.php
+zabbix/app/controllers/CControllerHousekeepingEdit.php
+zabbix/app/controllers/CControllerHousekeepingUpdate.php
+zabbix/app/controllers/CControllerIconMapCreate.php
+zabbix/app/controllers/CControllerIconMapDelete.php
+zabbix/app/controllers/CControllerIconMapEdit.php
+zabbix/app/controllers/CControllerIconMapList.php
+zabbix/app/controllers/CControllerIconMapUpdate.php
+zabbix/app/controllers/CControllerImageCreate.php
+zabbix/app/controllers/CControllerImageDelete.php
+zabbix/app/controllers/CControllerImageEdit.php
+zabbix/app/controllers/CControllerImageList.php
+zabbix/app/controllers/CControllerImageUpdate.php
+zabbix/app/controllers/CControllerLatest.php
+zabbix/app/controllers/CControllerLatestView.php
+zabbix/app/controllers/CControllerLatestViewRefresh.php
+zabbix/app/controllers/CControllerMacrosEdit.php
+zabbix/app/controllers/CControllerMacrosUpdate.php
 zabbix/app/controllers/CControllerMapView.php
 zabbix/app/controllers/CControllerMediatypeCreate.php
 zabbix/app/controllers/CControllerMediatypeDelete.php
@@ -49,16 +67,43 @@ zabbix/app/controllers/CControllerMediat
 zabbix/app/controllers/CControllerMediatypeList.php
 zabbix/app/controllers/CControllerMediatypeUpdate.php
 zabbix/app/controllers/CControllerMenuPopup.php
+zabbix/app/controllers/CControllerMiscConfigEdit.php
+zabbix/app/controllers/CControllerMiscConfigUpdate.php
+zabbix/app/controllers/CControllerModuleEdit.php
+zabbix/app/controllers/CControllerModuleList.php
+zabbix/app/controllers/CControllerModuleScan.php
+zabbix/app/controllers/CControllerModuleUpdate.php
 zabbix/app/controllers/CControllerNotificationsGet.php
 zabbix/app/controllers/CControllerNotificationsMute.php
 zabbix/app/controllers/CControllerNotificationsRead.php
+zabbix/app/controllers/CControllerPopup.php
+zabbix/app/controllers/CControllerPopupAcknowledgeCreate.php
+zabbix/app/controllers/CControllerPopupAcknowledgeEdit.php
+zabbix/app/controllers/CControllerPopupActionAcknowledge.php
+zabbix/app/controllers/CControllerPopupActionOperation.php
+zabbix/app/controllers/CControllerPopupActionRecovery.php
+zabbix/app/controllers/CControllerPopupConditionActions.php
+zabbix/app/controllers/CControllerPopupConditionCommon.php
+zabbix/app/controllers/CControllerPopupConditionEventCorr.php
+zabbix/app/controllers/CControllerPopupConditionOperations.php
+zabbix/app/controllers/CControllerPopupDiscoveryCheck.php
 zabbix/app/controllers/CControllerPopupGeneric.php
 zabbix/app/controllers/CControllerPopupHttpStep.php
+zabbix/app/controllers/CControllerPopupItemTest.php
+zabbix/app/controllers/CControllerPopupItemTestEdit.php
+zabbix/app/controllers/CControllerPopupItemTestGetValue.php
+zabbix/app/controllers/CControllerPopupItemTestSend.php
+zabbix/app/controllers/CControllerPopupLldOperation.php
+zabbix/app/controllers/CControllerPopupLldOverride.php
+zabbix/app/controllers/CControllerPopupMaintenancePeriod.php
 zabbix/app/controllers/CControllerPopupMedia.php
+zabbix/app/controllers/CControllerPopupMediatypeMessage.php
+zabbix/app/controllers/CControllerPopupMediatypeTestEdit.php
+zabbix/app/controllers/CControllerPopupMediatypeTestSend.php
+zabbix/app/controllers/CControllerPopupOperationCommon.php
 zabbix/app/controllers/CControllerPopupScriptExec.php
 zabbix/app/controllers/CControllerPopupServices.php
 zabbix/app/controllers/CControllerPopupTestTriggerExpr.php
-zabbix/app/controllers/CControllerPopupTrigDescView.php
 zabbix/app/controllers/CControllerPopupTriggerExpr.php
 zabbix/app/controllers/CControllerPopupTriggerWizard.php
 zabbix/app/controllers/CControllerProblemView.php
@@ -70,6 +115,12 @@ zabbix/app/controllers/CControllerProxyH
 zabbix/app/controllers/CControllerProxyHostEnable.php
 zabbix/app/controllers/CControllerProxyList.php
 zabbix/app/controllers/CControllerProxyUpdate.php
+zabbix/app/controllers/CControllerRegExCreate.php
+zabbix/app/controllers/CControllerRegExDelete.php
+zabbix/app/controllers/CControllerRegExEdit.php
+zabbix/app/controllers/CControllerRegExList.php
+zabbix/app/controllers/CControllerRegExTest.php
+zabbix/app/controllers/CControllerRegExUpdate.php
 zabbix/app/controllers/CControllerReportServices.php
 zabbix/app/controllers/CControllerReportStatus.php
 zabbix/app/controllers/CControllerScriptCreate.php
@@ -77,9 +128,36 @@ zabbix/app/controllers/CControllerScript
 zabbix/app/controllers/CControllerScriptEdit.php
 zabbix/app/controllers/CControllerScriptList.php
 zabbix/app/controllers/CControllerScriptUpdate.php
+zabbix/app/controllers/CControllerSearch.php
 zabbix/app/controllers/CControllerSystemWarning.php
 zabbix/app/controllers/CControllerTimeSelectorUpdate.php
-zabbix/app/controllers/CControllerTrigDescUpdate.php
+zabbix/app/controllers/CControllerTrigDisplayEdit.php
+zabbix/app/controllers/CControllerTrigDisplayUpdate.php
+zabbix/app/controllers/CControllerTrigSeverityEdit.php
+zabbix/app/controllers/CControllerTrigSeverityUpdate.php
+zabbix/app/controllers/CControllerUserCreate.php
+zabbix/app/controllers/CControllerUserDelete.php
+zabbix/app/controllers/CControllerUserEdit.php
+zabbix/app/controllers/CControllerUserEditGeneral.php
+zabbix/app/controllers/CControllerUserList.php
+zabbix/app/controllers/CControllerUserProfileEdit.php
+zabbix/app/controllers/CControllerUserProfileUpdate.php
+zabbix/app/controllers/CControllerUserUnblock.php
+zabbix/app/controllers/CControllerUserUpdate.php
+zabbix/app/controllers/CControllerUserUpdateGeneral.php
+zabbix/app/controllers/CControllerUsergroupCreate.php
+zabbix/app/controllers/CControllerUsergroupDelete.php
+zabbix/app/controllers/CControllerUsergroupEdit.php
+zabbix/app/controllers/CControllerUsergroupGrouprightAdd.php
+zabbix/app/controllers/CControllerUsergroupList.php
+zabbix/app/controllers/CControllerUsergroupMassUpdate.php
+zabbix/app/controllers/CControllerUsergroupTagfilterAdd.php
+zabbix/app/controllers/CControllerUsergroupUpdate.php
+zabbix/app/controllers/CControllerValuemapCreate.php
+zabbix/app/controllers/CControllerValuemapDelete.php
+zabbix/app/controllers/CControllerValuemapEdit.php
+zabbix/app/controllers/CControllerValuemapList.php
+zabbix/app/controllers/CControllerValuemapUpdate.php
 zabbix/app/controllers/CControllerWebView.php
 zabbix/app/controllers/CControllerWidget.php
 zabbix/app/controllers/CControllerWidgetActionLogView.php
@@ -90,6 +168,9 @@ zabbix/app/controllers/CControllerWidget
 zabbix/app/controllers/CControllerWidgetFavMapsView.php
 zabbix/app/controllers/CControllerWidgetFavScreensView.php
 zabbix/app/controllers/CControllerWidgetGraphView.php
+zabbix/app/controllers/CControllerWidgetHostAvailView.php
+zabbix/app/controllers/CControllerWidgetIterator.php
+zabbix/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php
 zabbix/app/controllers/CControllerWidgetMapView.php
 zabbix/app/controllers/CControllerWidgetNavTreeItemEdit.php
 zabbix/app/controllers/CControllerWidgetNavTreeItemUpdate.php
@@ -103,40 +184,114 @@ zabbix/app/controllers/CControllerWidget
 zabbix/app/controllers/CControllerWidgetTrigOverView.php
 zabbix/app/controllers/CControllerWidgetUrlView.php
 zabbix/app/controllers/CControllerWidgetWebView.php
+zabbix/app/controllers/CControllerWorkingTimeEdit.php
+zabbix/app/controllers/CControllerWorkingTimeUpdate.php
+zabbix/app/partials/
+zabbix/app/partials/administration.usergroup.grouprights.html.php
+zabbix/app/partials/administration.usergroup.tagfilters.html.php
+zabbix/app/partials/common.filter.trigger.php
+zabbix/app/partials/configuration.tags.tab.php
+zabbix/app/partials/dataoverview.table.left.php
+zabbix/app/partials/dataoverview.table.top.php
+zabbix/app/partials/hostmacros.inherited.list.html.php
+zabbix/app/partials/hostmacros.list.html.php
+zabbix/app/partials/js/
+zabbix/app/partials/js/common.filter.trigger.js.php
+zabbix/app/partials/js/configuration.tags.tab.js.php
+zabbix/app/partials/js/massupdate.macros.tab.js.php
+zabbix/app/partials/layout.htmlpage.aside.php
+zabbix/app/partials/layout.htmlpage.footer.php
+zabbix/app/partials/layout.htmlpage.header.php
+zabbix/app/partials/massupdate.macros.tab.php
+zabbix/app/partials/monitoring.dashboard.breadcrumbs.php
+zabbix/app/partials/monitoring.host.view.html.php
+zabbix/app/partials/monitoring.latest.view.html.php
+zabbix/app/partials/trigoverview.table.left.php
+zabbix/app/partials/trigoverview.table.top.php
 zabbix/app/views/
-zabbix/app/views/administration.authentication.edit.js.php
 zabbix/app/views/administration.authentication.edit.php
-zabbix/app/views/administration.mediatype.edit.js.php
+zabbix/app/views/administration.autoreg.edit.php
+zabbix/app/views/administration.gui.edit.php
+zabbix/app/views/administration.housekeeping.edit.php
+zabbix/app/views/administration.iconmap.edit.php
+zabbix/app/views/administration.iconmap.list.php
+zabbix/app/views/administration.image.edit.php
+zabbix/app/views/administration.image.list.php
+zabbix/app/views/administration.macros.edit.php
 zabbix/app/views/administration.mediatype.edit.php
 zabbix/app/views/administration.mediatype.list.php
-zabbix/app/views/administration.proxy.edit.js.php
+zabbix/app/views/administration.miscconfig.edit.php
+zabbix/app/views/administration.module.edit.php
+zabbix/app/views/administration.module.list.php
 zabbix/app/views/administration.proxy.edit.php
 zabbix/app/views/administration.proxy.list.php
-zabbix/app/views/administration.script.edit.js.php
+zabbix/app/views/administration.regex.edit.php
+zabbix/app/views/administration.regex.list.php
 zabbix/app/views/administration.script.edit.php
 zabbix/app/views/administration.script.list.php
+zabbix/app/views/administration.trigdisplay.edit.php
+zabbix/app/views/administration.trigseverity.edit.php
+zabbix/app/views/administration.user.edit.php
+zabbix/app/views/administration.user.list.php
+zabbix/app/views/administration.usergroup.edit.php
+zabbix/app/views/administration.usergroup.grouprights.php
+zabbix/app/views/administration.usergroup.list.php
+zabbix/app/views/administration.usergroup.tagfilters.php
+zabbix/app/views/administration.valuemap.edit.php
+zabbix/app/views/administration.valuemap.list.php
+zabbix/app/views/administration.workingtime.edit.php
 zabbix/app/views/dashboard.properties.edit.php
 zabbix/app/views/dashboard.sharing.edit.php
+zabbix/app/views/hostmacros.list.php
+zabbix/app/views/js/
+zabbix/app/views/js/administration.authentication.edit.js.php
+zabbix/app/views/js/administration.autoreg.edit.js.php
+zabbix/app/views/js/administration.housekeeping.edit.js.php
+zabbix/app/views/js/administration.iconmap.edit.js.php
+zabbix/app/views/js/administration.image.edit.js.php
+zabbix/app/views/js/administration.macros.edit.js.php
+zabbix/app/views/js/administration.mediatype.edit.js.php
+zabbix/app/views/js/administration.proxy.edit.js.php
+zabbix/app/views/js/administration.regex.edit.js.php
+zabbix/app/views/js/administration.script.edit.js.php
+zabbix/app/views/js/administration.trigdisplay.edit.js.php
+zabbix/app/views/js/administration.trigseverity.edit.js.php
+zabbix/app/views/js/administration.user.edit.common.js.php
+zabbix/app/views/js/administration.user.edit.js.php
+zabbix/app/views/js/administration.usergroup.edit.js.php
+zabbix/app/views/js/administration.userprofile.edit.js.php
+zabbix/app/views/js/administration.valuemap.edit.js.php
+zabbix/app/views/js/monitoring.charts.view.js.php
+zabbix/app/views/js/monitoring.dashboard.view.js.php
+zabbix/app/views/js/monitoring.host.view.js.php
+zabbix/app/views/js/monitoring.latest.view.js.php
+zabbix/app/views/js/monitoring.problem.view.js.php
+zabbix/app/views/js/popup.acknowledge.edit.js.php
+zabbix/app/views/js/popup.discovery.check.js.php
+zabbix/app/views/js/popup.itemtestedit.view.js.php
+zabbix/app/views/js/popup.maintenance.period.js.php
+zabbix/app/views/js/popup.media.js.php
+zabbix/app/views/js/popup.mediatype.message.js.php
+zabbix/app/views/js/popup.mediatypetest.edit.js.php
+zabbix/app/views/js/popup.triggerwizard.js.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
 zabbix/app/views/layout.htmlpage.php
 zabbix/app/views/layout.javascript.php
 zabbix/app/views/layout.json.php
 zabbix/app/views/layout.warning.php
 zabbix/app/views/layout.widget.php
 zabbix/app/views/layout.xml.php
-zabbix/app/views/monitoring.acknowledge.edit.js.php
-zabbix/app/views/monitoring.acknowledge.edit.php
-zabbix/app/views/monitoring.dashboard.breadcrumbs.php
+zabbix/app/views/monitoring.charts.view.json.php
+zabbix/app/views/monitoring.charts.view.php
 zabbix/app/views/monitoring.dashboard.list.php
-zabbix/app/views/monitoring.dashboard.view.js.php
 zabbix/app/views/monitoring.dashboard.view.php
 zabbix/app/views/monitoring.dashboard.widget.edit.php
 zabbix/app/views/monitoring.discovery.view.php
+zabbix/app/views/monitoring.host.view.php
+zabbix/app/views/monitoring.host.view.refresh.php
+zabbix/app/views/monitoring.latest.view.php
+zabbix/app/views/monitoring.latest.view.refresh.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.actionlog.view.php
@@ -147,8 +302,10 @@ zabbix/app/views/monitoring.widget.favgr
 zabbix/app/views/monitoring.widget.favmaps.view.php
 zabbix/app/views/monitoring.widget.favscreens.view.php
 zabbix/app/views/monitoring.widget.graph.view.php
+zabbix/app/views/monitoring.widget.hostavail.view.php
 zabbix/app/views/monitoring.widget.map.view.php
 zabbix/app/views/monitoring.widget.navtree.view.php
+zabbix/app/views/monitoring.widget.navtreeitem.edit.php
 zabbix/app/views/monitoring.widget.plaintext.view.php
 zabbix/app/views/monitoring.widget.problemhosts.view.php
 zabbix/app/views/monitoring.widget.problems.view.php
@@ -158,19 +315,29 @@ zabbix/app/views/monitoring.widget.syste
 zabbix/app/views/monitoring.widget.trigover.view.php
 zabbix/app/views/monitoring.widget.url.view.php
 zabbix/app/views/monitoring.widget.web.view.php
+zabbix/app/views/popup.acknowledge.edit.php
+zabbix/app/views/popup.condition.common.php
+zabbix/app/views/popup.discovery.check.php
 zabbix/app/views/popup.generic.php
 zabbix/app/views/popup.httpstep.php
-zabbix/app/views/popup.media.js.php
+zabbix/app/views/popup.itemtestedit.view.php
+zabbix/app/views/popup.lldoperation.php
+zabbix/app/views/popup.lldoverride.php
+zabbix/app/views/popup.maintenance.period.php
 zabbix/app/views/popup.media.php
+zabbix/app/views/popup.mediatype.message.php
+zabbix/app/views/popup.mediatypetest.edit.php
+zabbix/app/views/popup.operation.common.php
 zabbix/app/views/popup.scriptexec.php
 zabbix/app/views/popup.services.php
 zabbix/app/views/popup.testtriggerexpr.php
-zabbix/app/views/popup.trigdesc.view.php
 zabbix/app/views/popup.triggerexpr.php
-zabbix/app/views/popup.triggerwizard.js.php
 zabbix/app/views/popup.triggerwizard.php
+zabbix/app/views/popup.view.php
 zabbix/app/views/report.services.php
 zabbix/app/views/report.status.php
+zabbix/app/views/reports.auditlog.list.php
+zabbix/app/views/search.php
 zabbix/app/views/system.warning.php
 zabbix/applications.php
 zabbix/assets/
@@ -199,7 +366,6 @@ zabbix/audio/alarm_ok.mp3
 zabbix/audio/alarm_warning.mp3
 zabbix/audio/no_sound.mp3
 zabbix/auditacts.php
-zabbix/auditlogs.php
 zabbix/browserwarning.php
 zabbix/chart.php
 zabbix/chart2.php
@@ -208,12 +374,12 @@ zabbix/chart4.php
 zabbix/chart5.php
 zabbix/chart6.php
 zabbix/chart7.php
-zabbix/charts.php
 @owner www
 zabbix/conf/
 @owner
 zabbix/conf.import.php
 zabbix/conf/.htaccess
+zabbix/conf/certs/
 zabbix/conf/maintenance.inc.php
 zabbix/conf/zabbix.conf.php.example
 @mode 0640
@@ -255,6 +421,9 @@ zabbix/include/classes/api/CRelationMap.
 zabbix/include/classes/api/clients/
 zabbix/include/classes/api/clients/CApiClient.php
 zabbix/include/classes/api/clients/CLocalApiClient.php
+zabbix/include/classes/api/helpers/
+zabbix/include/classes/api/helpers/CApiHostHelper.php
+zabbix/include/classes/api/helpers/CApiTagHelper.php
 zabbix/include/classes/api/managers/
 zabbix/include/classes/api/managers/CApplicationManager.php
 zabbix/include/classes/api/managers/CGraphManager.php
@@ -270,6 +439,8 @@ zabbix/include/classes/api/services/CAPI
 zabbix/include/classes/api/services/CAction.php
 zabbix/include/classes/api/services/CAlert.php
 zabbix/include/classes/api/services/CApplication.php
+zabbix/include/classes/api/services/CAuditLog.php
+zabbix/include/classes/api/services/CAutoregistration.php
 zabbix/include/classes/api/services/CConfiguration.php
 zabbix/include/classes/api/services/CCorrelation.php
 zabbix/include/classes/api/services/CDCheck.php
@@ -300,6 +471,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/CModule.php
 zabbix/include/classes/api/services/CProblem.php
 zabbix/include/classes/api/services/CProxy.php
 zabbix/include/classes/api/services/CScreen.php
@@ -322,21 +494,23 @@ zabbix/include/classes/api/wrappers/
 zabbix/include/classes/api/wrappers/CApiWrapper.php
 zabbix/include/classes/api/wrappers/CFrontendApiWrapper.php
 zabbix/include/classes/core/
+zabbix/include/classes/core/APP.php
 zabbix/include/classes/core/CAjaxResponse.php
 zabbix/include/classes/core/CAutoloader.php
+zabbix/include/classes/core/CComponentRegistry.php
 zabbix/include/classes/core/CConfigFile.php
 zabbix/include/classes/core/CHttpRequest.php
 zabbix/include/classes/core/CJsonRpc.php
+zabbix/include/classes/core/CModule.php
+zabbix/include/classes/core/CModuleManager.php
 zabbix/include/classes/core/CRegistryFactory.php
 zabbix/include/classes/core/CSession.php
 zabbix/include/classes/core/ConfigFileException.php
 zabbix/include/classes/core/Manager.php
-zabbix/include/classes/core/Z.php
 zabbix/include/classes/core/ZBase.php
 zabbix/include/classes/db/
 zabbix/include/classes/db/DB.php
 zabbix/include/classes/db/DBException.php
-zabbix/include/classes/db/Db2DbBackend.php
 zabbix/include/classes/db/DbBackend.php
 zabbix/include/classes/db/MysqlDbBackend.php
 zabbix/include/classes/db/OracleDbBackend.php
@@ -364,21 +538,23 @@ zabbix/include/classes/helpers/CBrandHel
 zabbix/include/classes/helpers/CConditionHelper.php
 zabbix/include/classes/helpers/CElasticsearchHelper.php
 zabbix/include/classes/helpers/CHtml.php
-zabbix/include/classes/helpers/CJs.php
 zabbix/include/classes/helpers/CMapHelper.php
+zabbix/include/classes/helpers/CMathHelper.php
+zabbix/include/classes/helpers/CMediatypeHelper.php
 zabbix/include/classes/helpers/CMenuPopupHelper.php
+zabbix/include/classes/helpers/CPagerHelper.php
 zabbix/include/classes/helpers/CSvgGraphHelper.php
 zabbix/include/classes/helpers/CUploadFile.php
 zabbix/include/classes/helpers/CViewHelper.php
 zabbix/include/classes/html/
 zabbix/include/classes/html/CActionButtonList.php
-zabbix/include/classes/html/CArea.php
-zabbix/include/classes/html/CAreaMap.php
 zabbix/include/classes/html/CButton.php
 zabbix/include/classes/html/CButtonCancel.php
 zabbix/include/classes/html/CButtonDelete.php
+zabbix/include/classes/html/CButtonDropdown.php
 zabbix/include/classes/html/CButtonQMessage.php
 zabbix/include/classes/html/CCheckBox.php
+zabbix/include/classes/html/CCheckBoxList.php
 zabbix/include/classes/html/CClock.php
 zabbix/include/classes/html/CCol.php
 zabbix/include/classes/html/CColHeader.php
@@ -398,6 +574,7 @@ zabbix/include/classes/html/CIFrame.php
 zabbix/include/classes/html/CImageTextTable.php
 zabbix/include/classes/html/CImg.php
 zabbix/include/classes/html/CInput.php
+zabbix/include/classes/html/CInputSecret.php
 zabbix/include/classes/html/CJsScript.php
 zabbix/include/classes/html/CLabel.php
 zabbix/include/classes/html/CLink.php
@@ -405,19 +582,26 @@ zabbix/include/classes/html/CLinkAction.
 zabbix/include/classes/html/CList.php
 zabbix/include/classes/html/CListBox.php
 zabbix/include/classes/html/CListItem.php
+zabbix/include/classes/html/CMacroValue.php
+zabbix/include/classes/html/CMenu.php
+zabbix/include/classes/html/CMenuItem.php
 zabbix/include/classes/html/CMultiSelect.php
+zabbix/include/classes/html/CMultilineInput.php
 zabbix/include/classes/html/CNavigationTree.php
 zabbix/include/classes/html/CNumericBox.php
 zabbix/include/classes/html/CObject.php
 zabbix/include/classes/html/CParam.php
 zabbix/include/classes/html/CPassBox.php
+zabbix/include/classes/html/CPatternSelect.php
 zabbix/include/classes/html/CPre.php
 zabbix/include/classes/html/CRadioButtonList.php
 zabbix/include/classes/html/CRangeControl.php
 zabbix/include/classes/html/CRedirectButton.php
 zabbix/include/classes/html/CRow.php
 zabbix/include/classes/html/CRowHeader.php
+zabbix/include/classes/html/CScriptTag.php
 zabbix/include/classes/html/CSeverity.php
+zabbix/include/classes/html/CSeverityCheckBoxList.php
 zabbix/include/classes/html/CSimpleButton.php
 zabbix/include/classes/html/CSpan.php
 zabbix/include/classes/html/CSubmit.php
@@ -428,6 +612,7 @@ zabbix/include/classes/html/CTable.php
 zabbix/include/classes/html/CTableInfo.php
 zabbix/include/classes/html/CTag.php
 zabbix/include/classes/html/CTextArea.php
+zabbix/include/classes/html/CTextAreaFlexible.php
 zabbix/include/classes/html/CTextBox.php
 zabbix/include/classes/html/CTriggersInfo.php
 zabbix/include/classes/html/CUiWidget.php
@@ -444,6 +629,7 @@ zabbix/include/classes/html/svg/CSvgCirc
 zabbix/include/classes/html/svg/CSvgGraphAnnotation.php
 zabbix/include/classes/html/svg/CSvgGraphArea.php
 zabbix/include/classes/html/svg/CSvgGraphAxis.php
+zabbix/include/classes/html/svg/CSvgGraphBar.php
 zabbix/include/classes/html/svg/CSvgGraphGrid.php
 zabbix/include/classes/html/svg/CSvgGraphLegend.php
 zabbix/include/classes/html/svg/CSvgGraphLine.php
@@ -473,9 +659,15 @@ zabbix/include/classes/import/converters
 zabbix/include/classes/import/converters/C30ImportConverter.php
 zabbix/include/classes/import/converters/C32ImportConverter.php
 zabbix/include/classes/import/converters/C34ImportConverter.php
+zabbix/include/classes/import/converters/C40ImportConverter.php
+zabbix/include/classes/import/converters/C42ImportConverter.php
+zabbix/include/classes/import/converters/C44ImportConverter.php
+zabbix/include/classes/import/converters/CArrayKeysImportConverter.php
+zabbix/include/classes/import/converters/CConstantImportConverter.php
 zabbix/include/classes/import/converters/CConverter.php
-zabbix/include/classes/import/converters/CConverterChain.php
+zabbix/include/classes/import/converters/CDefaultImportConverter.php
 zabbix/include/classes/import/converters/CImportConverterFactory.php
+zabbix/include/classes/import/converters/CTransformImportConverter.php
 zabbix/include/classes/import/importers/
 zabbix/include/classes/import/importers/CAbstractScreenImporter.php
 zabbix/include/classes/import/importers/CHostImporter.php
@@ -496,12 +688,14 @@ zabbix/include/classes/import/validators
 zabbix/include/classes/import/validators/C32XmlValidator.php
 zabbix/include/classes/import/validators/C34XmlValidator.php
 zabbix/include/classes/import/validators/C40XmlValidator.php
+zabbix/include/classes/import/validators/C42XmlValidator.php
+zabbix/include/classes/import/validators/C44XmlValidator.php
+zabbix/include/classes/import/validators/C50XmlValidator.php
+zabbix/include/classes/import/validators/CImportValidatorFactory.php
 zabbix/include/classes/import/validators/CXmlValidator.php
 zabbix/include/classes/import/validators/CXmlValidatorGeneral.php
 zabbix/include/classes/items/
 zabbix/include/classes/items/CHelpItems.php
-zabbix/include/classes/json/
-zabbix/include/classes/json/CJson.php
 zabbix/include/classes/ldap/
 zabbix/include/classes/ldap/CLdap.php
 zabbix/include/classes/macros/
@@ -514,10 +708,10 @@ zabbix/include/classes/mvc/CControllerRe
 zabbix/include/classes/mvc/CControllerResponseData.php
 zabbix/include/classes/mvc/CControllerResponseFatal.php
 zabbix/include/classes/mvc/CControllerResponseRedirect.php
+zabbix/include/classes/mvc/CLegacyAction.php
+zabbix/include/classes/mvc/CPartial.php
 zabbix/include/classes/mvc/CRouter.php
 zabbix/include/classes/mvc/CView.php
-zabbix/include/classes/pagefilter/
-zabbix/include/classes/pagefilter/CPageFilter.php
 zabbix/include/classes/parsers/
 zabbix/include/classes/parsers/CADNameAttributeParser.php
 zabbix/include/classes/parsers/CAbsoluteTimeParser.php
@@ -538,7 +732,10 @@ zabbix/include/classes/parsers/CLLDMacro
 zabbix/include/classes/parsers/CLLDMacroParser.php
 zabbix/include/classes/parsers/CMacroFunctionParser.php
 zabbix/include/classes/parsers/CMacroParser.php
+zabbix/include/classes/parsers/CNumberParser.php
 zabbix/include/classes/parsers/CParser.php
+zabbix/include/classes/parsers/CPrometheusOutputParser.php
+zabbix/include/classes/parsers/CPrometheusPatternParser.php
 zabbix/include/classes/parsers/CRangeParser.php
 zabbix/include/classes/parsers/CRangeTimeParser.php
 zabbix/include/classes/parsers/CRangesParser.php
@@ -566,7 +763,6 @@ zabbix/include/classes/screens/
 zabbix/include/classes/screens/CScreenActions.php
 zabbix/include/classes/screens/CScreenBase.php
 zabbix/include/classes/screens/CScreenBuilder.php
-zabbix/include/classes/screens/CScreenChart.php
 zabbix/include/classes/screens/CScreenClock.php
 zabbix/include/classes/screens/CScreenDataOverview.php
 zabbix/include/classes/screens/CScreenDiscovery.php
@@ -584,7 +780,6 @@ zabbix/include/classes/screens/CScreenLl
 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
 zabbix/include/classes/screens/CScreenSystemStatus.php
@@ -612,9 +807,8 @@ zabbix/include/classes/validators/CActio
 zabbix/include/classes/validators/CApiInputValidator.php
 zabbix/include/classes/validators/CCollectionValidator.php
 zabbix/include/classes/validators/CColorValidator.php
-zabbix/include/classes/validators/CDecimalStringValidator.php
-zabbix/include/classes/validators/CDecimalValidator.php
 zabbix/include/classes/validators/CEmailValidator.php
+zabbix/include/classes/validators/CEventCorrCondValidator.php
 zabbix/include/classes/validators/CFunctionValidator.php
 zabbix/include/classes/validators/CHtmlUrlValidator.php
 zabbix/include/classes/validators/CIdValidator.php
@@ -641,15 +835,22 @@ zabbix/include/classes/widgets/fields/
 zabbix/include/classes/widgets/fields/CWidgetField.php
 zabbix/include/classes/widgets/fields/CWidgetFieldApplication.php
 zabbix/include/classes/widgets/fields/CWidgetFieldCheckBox.php
+zabbix/include/classes/widgets/fields/CWidgetFieldCheckBoxList.php
 zabbix/include/classes/widgets/fields/CWidgetFieldComboBox.php
 zabbix/include/classes/widgets/fields/CWidgetFieldDatePicker.php
 zabbix/include/classes/widgets/fields/CWidgetFieldGraphDataSet.php
 zabbix/include/classes/widgets/fields/CWidgetFieldGraphOverride.php
-zabbix/include/classes/widgets/fields/CWidgetFieldGroup.php
 zabbix/include/classes/widgets/fields/CWidgetFieldHidden.php
-zabbix/include/classes/widgets/fields/CWidgetFieldHost.php
+zabbix/include/classes/widgets/fields/CWidgetFieldHostPatternSelect.php
 zabbix/include/classes/widgets/fields/CWidgetFieldIntegerBox.php
-zabbix/include/classes/widgets/fields/CWidgetFieldItem.php
+zabbix/include/classes/widgets/fields/CWidgetFieldMs.php
+zabbix/include/classes/widgets/fields/CWidgetFieldMsGraph.php
+zabbix/include/classes/widgets/fields/CWidgetFieldMsGraphPrototype.php
+zabbix/include/classes/widgets/fields/CWidgetFieldMsGroup.php
+zabbix/include/classes/widgets/fields/CWidgetFieldMsHost.php
+zabbix/include/classes/widgets/fields/CWidgetFieldMsItem.php
+zabbix/include/classes/widgets/fields/CWidgetFieldMsItemPrototype.php
+zabbix/include/classes/widgets/fields/CWidgetFieldNavTree.php
 zabbix/include/classes/widgets/fields/CWidgetFieldNumericBox.php
 zabbix/include/classes/widgets/fields/CWidgetFieldRadioButtonList.php
 zabbix/include/classes/widgets/fields/CWidgetFieldRangeControl.php
@@ -657,7 +858,6 @@ zabbix/include/classes/widgets/fields/CW
 zabbix/include/classes/widgets/fields/CWidgetFieldSelectResource.php
 zabbix/include/classes/widgets/fields/CWidgetFieldSeverities.php
 zabbix/include/classes/widgets/fields/CWidgetFieldTags.php
-zabbix/include/classes/widgets/fields/CWidgetFieldTextArea.php
 zabbix/include/classes/widgets/fields/CWidgetFieldTextBox.php
 zabbix/include/classes/widgets/fields/CWidgetFieldUrl.php
 zabbix/include/classes/widgets/fields/CWidgetFieldWidgetListComboBox.php
@@ -667,6 +867,8 @@ zabbix/include/classes/widgets/forms/CWi
 zabbix/include/classes/widgets/forms/CWidgetFormClock.php
 zabbix/include/classes/widgets/forms/CWidgetFormDataOver.php
 zabbix/include/classes/widgets/forms/CWidgetFormGraph.php
+zabbix/include/classes/widgets/forms/CWidgetFormGraphPrototype.php
+zabbix/include/classes/widgets/forms/CWidgetFormHostAvail.php
 zabbix/include/classes/widgets/forms/CWidgetFormMap.php
 zabbix/include/classes/widgets/forms/CWidgetFormNavTree.php
 zabbix/include/classes/widgets/forms/CWidgetFormPlainText.php
@@ -686,6 +888,8 @@ zabbix/include/classes/widgets/views/wid
 zabbix/include/classes/widgets/views/widget.favmaps.form.view.php
 zabbix/include/classes/widgets/views/widget.favscreens.form.view.php
 zabbix/include/classes/widgets/views/widget.graph.form.view.php
+zabbix/include/classes/widgets/views/widget.graphprototype.form.view.php
+zabbix/include/classes/widgets/views/widget.hostavail.form.view.php
 zabbix/include/classes/widgets/views/widget.map.form.view.php
 zabbix/include/classes/widgets/views/widget.navtree.form.view.php
 zabbix/include/classes/widgets/views/widget.plaintext.form.view.php
@@ -697,6 +901,9 @@ zabbix/include/classes/widgets/views/wid
 zabbix/include/classes/widgets/views/widget.trigover.form.view.php
 zabbix/include/classes/widgets/views/widget.url.form.view.php
 zabbix/include/classes/widgets/views/widget.web.form.view.php
+zabbix/include/classes/xml/
+zabbix/include/classes/xml/CXmlConstantName.php
+zabbix/include/classes/xml/CXmlConstantValue.php
 zabbix/include/config.inc.php
 zabbix/include/correlation.inc.php
 zabbix/include/db.inc.php
@@ -738,27 +945,6 @@ zabbix/include/validate.inc.php
 zabbix/include/valuemap.inc.php
 zabbix/include/views/
 zabbix/include/views/administration.auditacts.list.php
-zabbix/include/views/administration.auditlogs.list.php
-zabbix/include/views/administration.general.gui.edit.php
-zabbix/include/views/administration.general.housekeeper.edit.php
-zabbix/include/views/administration.general.iconmap.edit.php
-zabbix/include/views/administration.general.iconmap.list.php
-zabbix/include/views/administration.general.image.edit.php
-zabbix/include/views/administration.general.image.list.php
-zabbix/include/views/administration.general.macros.edit.php
-zabbix/include/views/administration.general.other.edit.php
-zabbix/include/views/administration.general.regularexpressions.edit.php
-zabbix/include/views/administration.general.regularexpressions.list.php
-zabbix/include/views/administration.general.trigger.options.edit.php
-zabbix/include/views/administration.general.trigseverity.edit.php
-zabbix/include/views/administration.general.valuemapping.edit.php
-zabbix/include/views/administration.general.valuemapping.list.php
-zabbix/include/views/administration.general.workingtime.edit.php
-zabbix/include/views/administration.usergroups.edit.php
-zabbix/include/views/administration.usergroups.list.php
-zabbix/include/views/administration.users.edit.php
-zabbix/include/views/administration.users.list.php
-zabbix/include/views/common.filter.trigger.php
 zabbix/include/views/conf.import.php
 zabbix/include/views/configuration.action.edit.php
 zabbix/include/views/configuration.action.list.php
@@ -787,13 +973,14 @@ zabbix/include/views/configuration.item.
 zabbix/include/views/configuration.item.massupdate.php
 zabbix/include/views/configuration.item.prototype.edit.php
 zabbix/include/views/configuration.item.prototype.list.php
+zabbix/include/views/configuration.item.prototype.massupdate.php
 zabbix/include/views/configuration.maintenance.edit.php
 zabbix/include/views/configuration.maintenance.list.php
 zabbix/include/views/configuration.services.edit.php
 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.template.massupdate.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
@@ -803,22 +990,12 @@ zabbix/include/views/configuration.trigg
 zabbix/include/views/general.browserwarning.php
 zabbix/include/views/general.login.php
 zabbix/include/views/general.warning.php
-zabbix/include/views/hostmacros.php
 zabbix/include/views/inventory.host.list.php
 zabbix/include/views/inventory.host.view.php
 zabbix/include/views/js/
-zabbix/include/views/js/adm.regexprs.edit.js.php
-zabbix/include/views/js/administration.general.gui.php
-zabbix/include/views/js/administration.general.housekeeper.edit.js.php
-zabbix/include/views/js/administration.general.iconmap.js.php
-zabbix/include/views/js/administration.general.macros.edit.js.php
-zabbix/include/views/js/administration.general.trigger.options.js.php
-zabbix/include/views/js/administration.general.trigseverity.js.php
-zabbix/include/views/js/administration.general.valuemapping.edit.js.php
-zabbix/include/views/js/administration.users.edit.js.php
-zabbix/include/views/js/common.filter.trigger.js.php
 zabbix/include/views/js/common.init.js.php
 zabbix/include/views/js/common.item.edit.js.php
+zabbix/include/views/js/common.template.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.copy.elements.js.php
@@ -826,6 +1003,8 @@ zabbix/include/views/js/configuration.co
 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
+zabbix/include/views/js/configuration.host.discovery.edit.overr.js.php
+zabbix/include/views/js/configuration.host.discovery.list.js.php
 zabbix/include/views/js/configuration.host.edit.js.php
 zabbix/include/views/js/configuration.host.list.js.php
 zabbix/include/views/js/configuration.host.massupdate.js.php
@@ -837,16 +1016,20 @@ zabbix/include/views/js/configuration.it
 zabbix/include/views/js/configuration.item.prototype.edit.js.php
 zabbix/include/views/js/configuration.maintenance.edit.js.php
 zabbix/include/views/js/configuration.services.edit.js.php
+zabbix/include/views/js/configuration.template.list.js.php
+zabbix/include/views/js/configuration.template.massupdate.js.php
+zabbix/include/views/js/configuration.trigger.massupdate.js.php
 zabbix/include/views/js/configuration.triggers.edit.js.php
 zabbix/include/views/js/configuration.triggers.list.js.php
-zabbix/include/views/js/hostmacros.js.php
-zabbix/include/views/js/monitoring.latest.js.php
+zabbix/include/views/js/editabletable.js.php
+zabbix/include/views/js/item.preprocessing.js.php
+zabbix/include/views/js/itemtest.js.php
 zabbix/include/views/js/monitoring.screen.edit.js.php
+zabbix/include/views/js/monitoring.screen.js.php
 zabbix/include/views/js/monitoring.slideconf.edit.js.php
 zabbix/include/views/js/monitoring.slides.js.php
 zabbix/include/views/js/monitoring.sysmap.edit.js.php
 zabbix/include/views/js/monitoring.sysmaps.js.php
-zabbix/include/views/monitoring.charts.php
 zabbix/include/views/monitoring.history.php
 zabbix/include/views/monitoring.hostscreen.php
 zabbix/include/views/monitoring.overview.items.php
@@ -865,10 +1048,12 @@ zabbix/include/views/monitoring.sysmap.l
 zabbix/include/views/reports.toptriggers.php
 zabbix/index.php
 zabbix/index_http.php
+zabbix/index_sso.php
 zabbix/items.php
 zabbix/js/
 zabbix/js/browsers.js
 zabbix/js/chkbxrange.js
+zabbix/js/class.base-component.js
 zabbix/js/class.bbcode.js
 zabbix/js/class.browsertab.js
 zabbix/js/class.calendar.js
@@ -888,15 +1073,20 @@ zabbix/js/class.curl.js
 zabbix/js/class.cverticalaccordion.js
 zabbix/js/class.cviewswitcher.js
 zabbix/js/class.localstorage.js
-zabbix/js/class.mapwidget.js
-zabbix/js/class.notification.js
+zabbix/js/class.mapWidget.js
+zabbix/js/class.menu-item.js
+zabbix/js/class.menu.js
 zabbix/js/class.notification.collection.js
-zabbix/js/class.notifications.js
+zabbix/js/class.notification.js
 zabbix/js/class.notifications.audio.js
+zabbix/js/class.notifications.js
+zabbix/js/class.overlay.js
 zabbix/js/class.overlaycollection.js
 zabbix/js/class.pmaster.js
-zabbix/js/class.promise.js
 zabbix/js/class.rpc.js
+zabbix/js/class.scrollable.js
+zabbix/js/class.sidebar.js
+zabbix/js/class.template.js
 zabbix/js/colorpicker.js
 zabbix/js/common.js
 zabbix/js/csvggraphwidget.js
@@ -905,28 +1095,33 @@ zabbix/js/flickerfreescreen.js
 zabbix/js/functions.js
 zabbix/js/gtlc.js
 zabbix/js/init.js
+zabbix/js/inputsecret.js
 zabbix/js/layout.mode.js
+zabbix/js/macrovalue.js
 zabbix/js/main.js
 zabbix/js/menupopup.js
+zabbix/js/multilineinput.js
 zabbix/js/multiselect.js
 zabbix/js/pages/
 zabbix/js/pages/items.js
+zabbix/js/pages/popup.condition.common.js
+zabbix/js/pages/popup.operation.common.js
 zabbix/js/servercheck.js
+zabbix/js/textareaflexible.js
 zabbix/js/vector/
 zabbix/js/vector/class.svg.canvas.js
 zabbix/js/vector/class.svg.map.js
 zabbix/js/vendors/
 zabbix/js/vendors/jquery-ui.js
 zabbix/js/vendors/jquery.js
-zabbix/js/vendors/prototype.js
 zabbix/jsLoader.php
 zabbix/jsrpc.php
-zabbix/latest.php
 zabbix/local/
 zabbix/local/.htaccess
 zabbix/local/README
 zabbix/local/app/
 zabbix/local/app/controllers/
+zabbix/local/app/partials/
 zabbix/local/app/views/
 zabbix/local/conf/
 zabbix/locale/
@@ -1069,8 +1264,8 @@ zabbix/locale/zh_TW/LC_MESSAGES/frontend
 zabbix/maintenance.php
 zabbix/map.import.php
 zabbix/map.php
+zabbix/modules/
 zabbix/overview.php
-zabbix/profile.php
 zabbix/queue.php
 zabbix/report2.php
 zabbix/report4.php
@@ -1079,7 +1274,6 @@ zabbix/screen.import.php
 zabbix/screenconf.php
 zabbix/screenedit.php
 zabbix/screens.php
-zabbix/search.php
 zabbix/services.php
 zabbix/setup.php
 zabbix/slideconf.php
@@ -1092,8 +1286,58 @@ zabbix/toptriggers.php
 zabbix/tr_events.php
 zabbix/trigger_prototypes.php
 zabbix/triggers.php
-zabbix/usergrps.php
-zabbix/users.php
+zabbix/vendor/
+zabbix/vendor/php-saml/
+zabbix/vendor/php-saml/CHANGELOG
+zabbix/vendor/php-saml/LICENSE
+zabbix/vendor/php-saml/README.md
+zabbix/vendor/php-saml/_toolkit_loader.php
+zabbix/vendor/php-saml/advanced_settings_example.php
+zabbix/vendor/php-saml/certs/
+zabbix/vendor/php-saml/certs/README
+zabbix/vendor/php-saml/composer.json
+zabbix/vendor/php-saml/phpunit.xml
+zabbix/vendor/php-saml/settings_example.php
+zabbix/vendor/php-saml/src/
+zabbix/vendor/php-saml/src/Saml2/
+zabbix/vendor/php-saml/src/Saml2/Auth.php
+zabbix/vendor/php-saml/src/Saml2/AuthnRequest.php
+zabbix/vendor/php-saml/src/Saml2/Constants.php
+zabbix/vendor/php-saml/src/Saml2/Error.php
+zabbix/vendor/php-saml/src/Saml2/IdPMetadataParser.php
+zabbix/vendor/php-saml/src/Saml2/LogoutRequest.php
+zabbix/vendor/php-saml/src/Saml2/LogoutResponse.php
+zabbix/vendor/php-saml/src/Saml2/Metadata.php
+zabbix/vendor/php-saml/src/Saml2/Response.php
+zabbix/vendor/php-saml/src/Saml2/Settings.php
+zabbix/vendor/php-saml/src/Saml2/Utils.php
+zabbix/vendor/php-saml/src/Saml2/ValidationError.php
+zabbix/vendor/php-saml/src/Saml2/schemas/
+zabbix/vendor/php-saml/src/Saml2/schemas/saml-schema-assertion-2.0.xsd
+zabbix/vendor/php-saml/src/Saml2/schemas/saml-schema-authn-context-2.0.xsd
+zabbix/vendor/php-saml/src/Saml2/schemas/saml-schema-authn-context-types-2.0.xsd
+zabbix/vendor/php-saml/src/Saml2/schemas/saml-schema-metadata-2.0.xsd
+zabbix/vendor/php-saml/src/Saml2/schemas/saml-schema-protocol-2.0.xsd
+zabbix/vendor/php-saml/src/Saml2/schemas/sstc-metadata-attr.xsd
+zabbix/vendor/php-saml/src/Saml2/schemas/sstc-saml-attribute-ext.xsd
+zabbix/vendor/php-saml/src/Saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd
+zabbix/vendor/php-saml/src/Saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd
+zabbix/vendor/php-saml/src/Saml2/schemas/xenc-schema.xsd
+zabbix/vendor/php-saml/src/Saml2/schemas/xml.xsd
+zabbix/vendor/php-saml/src/Saml2/schemas/xmldsig-core-schema.xsd
+zabbix/vendor/php-saml/src/Saml2/version.json
+zabbix/vendor/xmlseclibs/
+zabbix/vendor/xmlseclibs/CHANGELOG.txt
+zabbix/vendor/xmlseclibs/LICENSE
+zabbix/vendor/xmlseclibs/README.md
+zabbix/vendor/xmlseclibs/composer.json
+zabbix/vendor/xmlseclibs/src/
+zabbix/vendor/xmlseclibs/src/Utils/
+zabbix/vendor/xmlseclibs/src/Utils/XPath.php
+zabbix/vendor/xmlseclibs/src/XMLSecEnc.php
+zabbix/vendor/xmlseclibs/src/XMLSecurityDSig.php
+zabbix/vendor/xmlseclibs/src/XMLSecurityKey.php
+zabbix/vendor/xmlseclibs/xmlseclibs.php
 zabbix/zabbix.php
 @cwd ${LOCALBASE}
 share/examples/php-${MODPHP_VERSION}/
Index: pkg/README-web
===================================================================
RCS file: /cvs/ports/net/zabbix/pkg/README-web,v
retrieving revision 1.12
diff -u -p -u -r1.12 README-web
--- pkg/README-web 5 Sep 2018 09:24:31 -0000 1.12
+++ pkg/README-web 30 May 2020 08:49:40 -0000
@@ -75,7 +75,7 @@ httpd.conf(5)
 =============
 
 server "zabbix.example.com" {
- listen on * 80
+ listen on * port 80
  listen on * tls port 443
  directory { index "index.php" }
 

Reply | Threaded
Open this post in threaded view
|

Re: update zabbix to 5.0.1

Mark Patruck
On 2020-06-11 19:34, Mark Patruck wrote:

> On 2020-05-30 10:51, Robert Nagy wrote:
>> Hi
>>
>> The following diff takes us to zabbix 5.0 LTS, but this will require some more
>> widespread testing, so I am sharing the diff here first before I commit it.
>>
>> Please run with it and share the results.
>
>      No issues after almost one week of running with my pgsql test
>      setup. I plan on switching my backup production system at the
>      weekend.

        I'm running 5.0.1 on my production master/backup systems with
        postgresql replication now and everything looks fine after few
        days.

        First impressions:

        - postgresql: scram-sha-256 can be used as default now

        - snmp: as configured on host level now, change exported
          hosts/templates accordingly

        - snmp: traps work

        - templates: when importing zabbix 4 zbx_export_hosts.xml,
                     check for renamed templates, f.e.
                     "Template OS Linux by Zabbix agent"

        - remote commands: simply works

        - api: simply works

        - encryption: encrypted communication between agents<->server
                      works like before

        - timecounter: OpenBSDs' kern.timecounter.hardware still has
                       to be set to acpihpet0 instead of tsc on ESXi,
                       otherwise zabbix' "preprocessing manager" fires
                       all the time. (~ 100% utilization). When using
                       tsc on vmd instead of pvclock0 everything's fine.



--
Mark Patruck ( mark at wrapped.cx )
GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74  F644 0D3C F66F F286 5E51

https://www.wrapped.cx