Hi The patch does not apply :)
On 28/11/24 14:54 +0100, Mark Patruck wrote: > Update net/zabbix to 7.0.6 released eight days ago. > > Release notes 7.0.6: > https://www.zabbix.com/rn/rn7.0.6 > > Changes in 7.0.6: > https://www.zabbix.com/documentation/7.0/en/manual/introduction/whatsnew706 > > Upgrade notes 7.0.6: > https://www.zabbix.com/documentation/7.0/en/manual/installation/upgrade_notes_706 > > > Includes upstream support for PostgreSQL 17 and TimescaleDB 2.17 > > Runs fine with PostgreSQL+TimescaleDB. No errors spotted after updating > and i even did a fresh install (PostgreSQL only). > > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/zabbix/Makefile,v > retrieving revision 1.217 > diff -u -p -r1.217 Makefile > --- Makefile 12 Sep 2024 14:16:35 -0000 1.217 > +++ Makefile 20 Nov 2024 21:20:07 -0000 > @@ -3,7 +3,7 @@ COMMENT-server = network and application > COMMENT-proxy = network and application monitoring - proxy > COMMENT-web = network and application monitoring - web > frontend > -VERSION = 6.4.18 > +VERSION = 7.0.6 > DISTNAME = zabbix-${VERSION} > FULLPKGNAME-main = zabbix-agent-${VERSION} > FULLPKGPATH-main = net/zabbix,-main > @@ -13,8 +13,6 @@ FULLPKGNAME-web = zabbix-web-${VERSION} > FULLPKGPATH-web = net/zabbix,-web > CATEGORIES = net > -REVISION-server = 0 > - > MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/} > HOMEPAGE = http://www.zabbix.com/ > @@ -55,7 +53,7 @@ LIB_DEPENDS-server = ${LIB_DEPENDS} \ > 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} event_core event_pthreads \ > +WANTLIB-server = ${WANTLIB} event_core event_extra event_pthreads \ > crypto ssl z netsnmp ssh2 xml2 > CONFIGURE_STYLE = gnu > @@ -84,8 +82,8 @@ LIB_DEPENDS-proxy = ${LIB_DEPENDS} \ > net/net-snmp \ > security/libssh2 \ > textproc/libxml > -WANTLIB-proxy = ${WANTLIB} event_core event_pthreads netsnmp \ > - ssh2 xml2 > +WANTLIB-proxy = ${WANTLIB} event_core event_extra > event_pthreads \ > + netsnmp ssh2 xml2 > RUN_DEPENDS-proxy = # empty > FLAVOR ?= no_server > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/zabbix/distinfo,v > retrieving revision 1.81 > diff -u -p -r1.81 distinfo > --- distinfo 10 Sep 2024 15:56:13 -0000 1.81 > +++ distinfo 20 Nov 2024 21:20:07 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (zabbix-6.4.18.tar.gz) = DfilvVTQL4A3Tx9OoZN83DAV/+QZj+1e/wtiWq970EY= > -SIZE (zabbix-6.4.18.tar.gz) = 46907603 > +SHA256 (zabbix-7.0.6.tar.gz) = DXfODjhNbTCqc55ZZIBGqtoxqX/NfWJr2a+jfkIKLdA= > +SIZE (zabbix-7.0.6.tar.gz) = 44028175 > Index: patches/patch-conf_zabbix_proxy_conf > =================================================================== > RCS file: /cvs/ports/net/zabbix/patches/patch-conf_zabbix_proxy_conf,v > retrieving revision 1.14 > diff -u -p -r1.14 patch-conf_zabbix_proxy_conf > --- patches/patch-conf_zabbix_proxy_conf 26 Apr 2023 20:30:54 -0000 > 1.14 > +++ patches/patch-conf_zabbix_proxy_conf 20 Nov 2024 21:20:07 -0000 > @@ -19,7 +19,7 @@ Index: conf/zabbix_proxy.conf > ### Option: SocketDir > # IPC socket directory. > -@@ -193,6 +193,7 @@ DBUser=zabbix > +@@ -195,6 +195,7 @@ DBUser=zabbix > # Mandatory: no > # Default: > # DBSocket= > @@ -27,7 +27,7 @@ Index: conf/zabbix_proxy.conf > # Option: DBPort > # Database port when not using local socket. Ignored for SQLite. > -@@ -523,6 +524,7 @@ Timeout=4 > +@@ -602,6 +603,7 @@ Timeout=4 > # Mandatory: no > # Default: > # ExternalScripts=${datadir}/zabbix/externalscripts > @@ -35,7 +35,7 @@ Index: conf/zabbix_proxy.conf > ### Option: FpingLocation > # Location of fping. > -@@ -531,6 +533,7 @@ Timeout=4 > +@@ -610,6 +612,7 @@ Timeout=4 > # Mandatory: no > # Default: > # FpingLocation=/usr/sbin/fping > @@ -43,7 +43,7 @@ Index: conf/zabbix_proxy.conf > ### Option: Fping6Location > # Location of fping6. > -@@ -540,6 +543,7 @@ Timeout=4 > +@@ -619,6 +622,7 @@ Timeout=4 > # Mandatory: no > # Default: > # Fping6Location=/usr/sbin/fping6 > Index: patches/patch-conf_zabbix_server_conf > =================================================================== > RCS file: /cvs/ports/net/zabbix/patches/patch-conf_zabbix_server_conf,v > retrieving revision 1.16 > diff -u -p -r1.16 patch-conf_zabbix_server_conf > --- patches/patch-conf_zabbix_server_conf 26 Apr 2023 20:30:54 -0000 > 1.16 > +++ patches/patch-conf_zabbix_server_conf 20 Nov 2024 21:20:07 -0000 > @@ -10,7 +10,7 @@ Index: conf/zabbix_server.conf > ### Option: LogFileSize > # Maximum size of log file in MB. > -@@ -128,6 +128,7 @@ DBUser=zabbix > +@@ -130,6 +130,7 @@ DBUser=zabbix > # Mandatory: no > # Default: > # DBSocket= > @@ -18,7 +18,7 @@ Index: conf/zabbix_server.conf > ### Option: DBPort > # Database port when not using local socket. > -@@ -554,6 +555,7 @@ Timeout=4 > +@@ -590,6 +591,7 @@ Timeout=4 > # Mandatory: no > # Default: > # AlertScriptsPath=${datadir}/zabbix/alertscripts > @@ -26,7 +26,7 @@ Index: conf/zabbix_server.conf > ### Option: ExternalScripts > # Full path to location of external scripts. > -@@ -571,6 +573,7 @@ Timeout=4 > +@@ -607,6 +609,7 @@ Timeout=4 > # Mandatory: no > # Default: > # FpingLocation=/usr/sbin/fping > @@ -34,7 +34,7 @@ Index: conf/zabbix_server.conf > ### Option: Fping6Location > # Location of fping6. > -@@ -580,6 +583,7 @@ Timeout=4 > +@@ -616,6 +619,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.42 > diff -u -p -r1.42 patch-configure > --- patches/patch-configure 10 Sep 2024 15:56:13 -0000 1.42 > +++ patches/patch-configure 20 Nov 2024 21:20:07 -0000 > @@ -1,7 +1,7 @@ > Index: configure > --- configure.orig > +++ configure > -@@ -7555,6 +7555,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > +@@ -7589,6 +7589,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > #include <stdlib.h> > #include <sys/queue.h> > @@ -9,7 +9,7 @@ Index: configure > #include <sys/sensors.h> > int > main (void) > -@@ -13357,7 +13358,7 @@ if test ${with_libevent+y} > +@@ -13515,7 +13516,7 @@ if test ${with_libevent+y} > then : > withval=$with_libevent; > if test "x$withval" = "xyes"; then > @@ -18,7 +18,16 @@ Index: configure > fi > LIBEVENT_CFLAGS="-I$withval/include" > -@@ -13428,7 +13429,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > +@@ -13554,7 +13555,7 @@ fi > + printf %s "checking for libevent support... " >&6; } > + + if test "x$ARCH" = "xopenbsd"; then > +- LIBEVENT_LIBS="-levent_core -levent_pthreads" > ++ LIBEVENT_LIBS="-levent_core -levent_pthreads -levent_extra" > + else > + LIBEVENT_LIBS="-levent -levent_pthreads" > + fi > +@@ -13586,7 +13587,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext > /* end confdefs.h. */ > #include <stdlib.h> > @@ -27,7 +36,7 @@ Index: configure > #include <event2/thread.h> > int > -@@ -18861,16 +18862,16 @@ printf "%s\n" "no" >&6; } > +@@ -18980,16 +18981,16 @@ fi > RANLIB="ranlib" > Index: patches/patch-include_common_zbxsysinc_h > =================================================================== > RCS file: /cvs/ports/net/zabbix/patches/patch-include_common_zbxsysinc_h,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-include_common_zbxsysinc_h > --- patches/patch-include_common_zbxsysinc_h 10 Sep 2024 15:56:13 -0000 > 1.3 > +++ patches/patch-include_common_zbxsysinc_h 20 Nov 2024 21:20:07 -0000 > @@ -5,7 +5,7 @@ for this file > Index: include/common/zbxsysinc.h > --- include/common/zbxsysinc.h.orig > +++ include/common/zbxsysinc.h > -@@ -293,6 +293,7 @@ > +@@ -291,6 +291,7 @@ > #ifdef HAVE_NET_IF_H > # include <net/if.h> > Index: patches/patch-include_zbx_dbversion_constants_h > =================================================================== > RCS file: > /cvs/ports/net/zabbix/patches/patch-include_zbx_dbversion_constants_h,v > retrieving revision 1.5 > diff -u -p -r1.5 patch-include_zbx_dbversion_constants_h > --- patches/patch-include_zbx_dbversion_constants_h 10 Sep 2024 15:56:13 > -0000 1.5 > +++ patches/patch-include_zbx_dbversion_constants_h 20 Nov 2024 21:20:07 > -0000 > @@ -1,14 +0,0 @@ > -Index: include/zbx_dbversion_constants.h > ---- include/zbx_dbversion_constants.h.orig > -+++ include/zbx_dbversion_constants.h > -@@ -64,8 +64,8 @@ > - #define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION 20001 > - #define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION_STR "2.0.1" > - #define ZBX_TIMESCALE_MIN_VERSION_WITH_LICENSE_PARAM_SUPPORT 20000 > --#define ZBX_TIMESCALE_MAX_VERSION 21599 > --#define ZBX_TIMESCALE_MAX_VERSION_STR "2.15" > -+#define ZBX_TIMESCALE_MAX_VERSION 21699 > -+#define ZBX_TIMESCALE_MAX_VERSION_STR "2.16" > - #define ZBX_TIMESCALE_LICENSE_APACHE_STR "TimescaleDB > Apache 2 Edition" > - #define ZBX_TIMESCALE_LICENSE_COMMUNITY > "timescale" > - #define ZBX_TIMESCALE_LICENSE_COMMUNITY_STR "TimescaleDB > Community Edition" > Index: patches/patch-include_zbxasynchttppoller_h > =================================================================== > RCS file: patches/patch-include_zbxasynchttppoller_h > diff -N patches/patch-include_zbxasynchttppoller_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-include_zbxasynchttppoller_h 20 Nov 2024 21:20:07 > -0000 > @@ -0,0 +1,12 @@ > +Index: include/zbxasynchttppoller.h > +--- include/zbxasynchttppoller.h.orig > ++++ include/zbxasynchttppoller.h > +@@ -17,7 +17,7 @@ > + #include "zbxsysinc.h" > + + #if defined(HAVE_LIBCURL) && defined(HAVE_LIBEVENT) > +-#include <event.h> > ++#include <event2/event.h> > + + typedef void (*process_httpagent_result_callback_fn)(CURL *easy_handle, > CURLcode err, void *arg); > + typedef void (*httpagent_action_callback_fn)(void *arg); > Index: patches/patch-include_zbxasyncpoller_h > =================================================================== > RCS file: patches/patch-include_zbxasyncpoller_h > diff -N patches/patch-include_zbxasyncpoller_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-include_zbxasyncpoller_h 20 Nov 2024 21:20:07 -0000 > @@ -0,0 +1,13 @@ > +Index: include/zbxasyncpoller.h > +--- include/zbxasyncpoller.h.orig > ++++ include/zbxasyncpoller.h > +@@ -20,7 +20,8 @@ > + #define ZBX_RES_CONF_FILE "/etc/resolv.conf" > + + #ifdef HAVE_LIBEVENT > +-#include <event.h> > ++#include <event2/event.h> > ++#include <event2/dns.h> > + + typedef enum > + { > Index: patches/patch-include_zbxcomms_h > =================================================================== > RCS file: /cvs/ports/net/zabbix/patches/patch-include_zbxcomms_h,v > retrieving revision 1.2 > diff -u -p -r1.2 patch-include_zbxcomms_h > --- patches/patch-include_zbxcomms_h 26 Apr 2023 20:30:54 -0000 1.2 > +++ patches/patch-include_zbxcomms_h 20 Nov 2024 21:20:07 -0000 > @@ -1,12 +0,0 @@ > -Index: include/zbxcomms.h > ---- include/zbxcomms.h.orig > -+++ include/zbxcomms.h > -@@ -253,7 +253,7 @@ int zbx_telnet_execute(ZBX_SOCKET socket_fd, const > cha > - /* TLS BLOCK */ > - #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) > - --#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || > defined(LIBRESSL_VERSION_NUMBER) > -+#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL > - # if !defined(LIBRESSL_VERSION_NUMBER) > - # define OPENSSL_INIT_LOAD_SSL_STRINGS 0 > - # define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0 > Index: patches/patch-include_zbxsysinfo_h > =================================================================== > RCS file: /cvs/ports/net/zabbix/patches/patch-include_zbxsysinfo_h,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-include_zbxsysinfo_h > --- patches/patch-include_zbxsysinfo_h 26 Apr 2023 20:30:54 -0000 > 1.1 > +++ patches/patch-include_zbxsysinfo_h 20 Nov 2024 21:20:07 -0000 > @@ -1,7 +1,7 @@ > Index: include/zbxsysinfo.h > --- include/zbxsysinfo.h.orig > +++ include/zbxsysinfo.h > -@@ -154,7 +154,8 @@ extern int CONFIG_UNSAFE_USER_PARAMETERS; > +@@ -52,7 +52,8 @@ void *get_result_value_by_type(AGENT_RESULT *result, > i > #define ZBX_CPU_STATE_STEAL 7 > #define ZBX_CPU_STATE_GCPU 8 > #define ZBX_CPU_STATE_GNICE 9 > Index: patches/patch-src_libs_zbxcomms_tls_c > =================================================================== > RCS file: /cvs/ports/net/zabbix/patches/patch-src_libs_zbxcomms_tls_c,v > retrieving revision 1.2 > diff -u -p -r1.2 patch-src_libs_zbxcomms_tls_c > --- patches/patch-src_libs_zbxcomms_tls_c 26 Apr 2023 20:30:54 -0000 > 1.2 > +++ patches/patch-src_libs_zbxcomms_tls_c 20 Nov 2024 21:20:07 -0000 > @@ -1,14 +0,0 @@ > -Neuter OPENSSL_cleanup() redefinition. > - > -Index: src/libs/zbxcomms/tls.c > ---- src/libs/zbxcomms/tls.c.orig > -+++ src/libs/zbxcomms/tls.c > -@@ -30,7 +30,7 @@ > - #include "zbxstr.h" > - #include "zbxtime.h" > - --#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || > defined(LIBRESSL_VERSION_NUMBER) > -+#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL > - /* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ > - - /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and > example in crypto/threads/mttest.c) */ > Index: patches/patch-src_libs_zbxsysinfo_common_cpustat_c > =================================================================== > RCS file: patches/patch-src_libs_zbxsysinfo_common_cpustat_c > diff -N patches/patch-src_libs_zbxsysinfo_common_cpustat_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_libs_zbxsysinfo_common_cpustat_c 20 Nov 2024 > 21:20:07 -0000 > @@ -0,0 +1,19 @@ > +Index: src/libs/zbxsysinfo/common/cpustat.c > +--- src/libs/zbxsysinfo/common/cpustat.c.orig > ++++ src/libs/zbxsysinfo/common/cpustat.c > +@@ -661,6 +661,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]; > ++ counter[ZBX_CPU_STATE_SPIN] = > (zbx_uint64_t)all_states[CP_SPIN]; > + counter[ZBX_CPU_STATE_IDLE] = > (zbx_uint64_t)all_states[CP_IDLE]; > + } > + else > +@@ -681,6 +682,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]; > ++ counter[ZBX_CPU_STATE_SPIN] = > (zbx_uint64_t)one_states[CP_SPIN]; > + counter[ZBX_CPU_STATE_IDLE] = > (zbx_uint64_t)one_states[CP_IDLE]; > + } > + Index: patches/patch-src_libs_zbxsysinfo_openbsd_cpu_c > =================================================================== > RCS file: > /cvs/ports/net/zabbix/patches/patch-src_libs_zbxsysinfo_openbsd_cpu_c,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-src_libs_zbxsysinfo_openbsd_cpu_c > --- patches/patch-src_libs_zbxsysinfo_openbsd_cpu_c 26 Apr 2023 20:30:54 > -0000 1.3 > +++ patches/patch-src_libs_zbxsysinfo_openbsd_cpu_c 20 Nov 2024 21:20:07 > -0000 > @@ -3,7 +3,7 @@ Add ZBX_CPU_STATE_SPIN to monitor CP_SPI > Index: src/libs/zbxsysinfo/openbsd/cpu.c > --- src/libs/zbxsysinfo/openbsd/cpu.c.orig > +++ src/libs/zbxsysinfo/openbsd/cpu.c > -@@ -105,6 +105,8 @@ int system_cpu_util(AGENT_REQUEST *request, > AGENT_RESU > +@@ -100,6 +100,8 @@ int system_cpu_util(AGENT_REQUEST *request, > AGENT_RESU > state = ZBX_CPU_STATE_IDLE; > else if (0 == strcmp(tmp, "interrupt")) > state = ZBX_CPU_STATE_INTERRUPT; > 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.11 > diff -u -p -r1.11 patch-src_libs_zbxsysinfo_openbsd_net_c > --- patches/patch-src_libs_zbxsysinfo_openbsd_net_c 26 Apr 2023 20:30:54 > -0000 1.11 > +++ patches/patch-src_libs_zbxsysinfo_openbsd_net_c 20 Nov 2024 21:20:07 > -0000 > @@ -3,7 +3,7 @@ Stop using struct ifnet and libkvm for i > Index: src/libs/zbxsysinfo/openbsd/net.c > --- src/libs/zbxsysinfo/openbsd/net.c.orig > +++ src/libs/zbxsysinfo/openbsd/net.c > -@@ -37,7 +37,6 @@ > +@@ -31,7 +31,6 @@ > static struct nlist kernel_symbols[] = > { > @@ -11,22 +11,25 @@ Index: src/libs/zbxsysinfo/openbsd/net.c > {"_tcbtable", N_UNDF, 0, 0, 0}, > {NULL, 0, 0, 0, 0} > }; > -@@ -50,11 +49,6 @@ static int get_ifdata(const char *if_name, > +@@ -44,12 +43,8 @@ static int get_ifdata(const char *if_name, > zbx_uint64_t *icollisions, char **error) > { > #define IFNET_ID 0 > - struct ifnet_head head; > - struct ifnet *ifp; > -- > -- kvm_t *kp; > -- int len = 0; > - int ret = SYSINFO_RET_FAIL; > ++ int ret = SYSINFO_RET_FAIL; > +- kvm_t *kp; > +- int len = 0, ret = SYSINFO_RET_FAIL; > +- > if (NULL == if_name || '\0' == *if_name) > -@@ -95,66 +89,7 @@ static int get_ifdata(const char *if_name, > + { > + *error = zbx_strdup(NULL, "Network interface name cannot be > empty."); > +@@ -87,67 +82,7 @@ static int get_ifdata(const char *if_name, > + *terrors = 0; > if (icollisions) > *icollisions = 0; > - +- > - if (NULL != (kp = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL))) /* > requires root privileges */ > { > - struct ifnet v; > 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.12 > diff -u -p -r1.12 patch-src_zabbix_agent_cpustat_c > --- patches/patch-src_zabbix_agent_cpustat_c 1 Jun 2023 08:43:16 -0000 > 1.12 > +++ patches/patch-src_zabbix_agent_cpustat_c 20 Nov 2024 21:20:07 -0000 > @@ -1,21 +0,0 @@ > -Add ZBX_CPU_STATE_SPIN to monitor CP_SPIN > - > -Index: src/zabbix_agent/cpustat.c > ---- src/zabbix_agent/cpustat.c.orig > -+++ src/zabbix_agent/cpustat.c > -@@ -697,6 +697,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]; > -+ counter[ZBX_CPU_STATE_SPIN] = > (zbx_uint64_t)all_states[CP_SPIN]; > - counter[ZBX_CPU_STATE_IDLE] = > (zbx_uint64_t)all_states[CP_IDLE]; > - } > - else > -@@ -717,6 +718,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]; > -+ counter[ZBX_CPU_STATE_SPIN] = > (zbx_uint64_t)one_states[CP_SPIN]; > - counter[ZBX_CPU_STATE_IDLE] = > (zbx_uint64_t)one_states[CP_IDLE]; > - } > - Index: pkg/PLIST-main > =================================================================== > RCS file: /cvs/ports/net/zabbix/pkg/PLIST-main,v > retrieving revision 1.16 > diff -u -p -r1.16 PLIST-main > --- pkg/PLIST-main 11 Jul 2022 17:22:41 -0000 1.16 > +++ pkg/PLIST-main 20 Nov 2024 21:20:07 -0000 > @@ -25,5 +25,3 @@ share/examples/zabbix/zabbix_agentd.conf > @group > @sample /var/log/zabbix/ > @comment share/examples/zabbix/zabbix_agentd.win.conf > -@mode > -@owner > Index: pkg/PLIST-proxy > =================================================================== > RCS file: /cvs/ports/net/zabbix/pkg/PLIST-proxy,v > retrieving revision 1.13 > diff -u -p -r1.13 PLIST-proxy > --- pkg/PLIST-proxy 12 Dec 2023 10:58:35 -0000 1.13 > +++ pkg/PLIST-proxy 20 Nov 2024 21:20:07 -0000 > @@ -22,8 +22,7 @@ share/zabbix-proxy/schema/mysql/option-p > @comment share/zabbix-proxy/schema/mysql/option-patches/Makefile > @comment share/zabbix-proxy/schema/mysql/option-patches/Makefile.am > @comment share/zabbix-proxy/schema/mysql/option-patches/Makefile.in > -share/zabbix-proxy/schema/mysql/option-patches/double.sql > -share/zabbix-proxy/schema/mysql/option-patches/history_pk_prepare.sql > +share/zabbix-proxy/schema/mysql/option-patches/history_upgrade_prepare.sql > share/zabbix-proxy/schema/mysql/schema.sql > share/zabbix-proxy/schema/postgresql/ > @comment share/zabbix-proxy/schema/postgresql/Makefile > @@ -35,8 +34,7 @@ share/zabbix-proxy/schema/postgresql/opt > @comment share/zabbix-proxy/schema/postgresql/option-patches/Makefile > @comment share/zabbix-proxy/schema/postgresql/option-patches/Makefile.am > @comment share/zabbix-proxy/schema/postgresql/option-patches/Makefile.in > -share/zabbix-proxy/schema/postgresql/option-patches/double.sql > -share/zabbix-proxy/schema/postgresql/option-patches/history_pk_prepare.sql > +share/zabbix-proxy/schema/postgresql/option-patches/history_upgrade_prepare.sql > share/zabbix-proxy/schema/postgresql/schema.sql > share/zabbix-proxy/schema/postgresql/timescaledb/ > @comment share/zabbix-proxy/schema/postgresql/timescaledb/Makefile > @@ -50,27 +48,29 @@ share/zabbix-proxy/schema/postgresql/tim > @comment > share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/Makefile > @comment > share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/Makefile.am > @comment > share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/Makefile.in > -share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/history_pk.sql > -share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/history_pk_log.sql > -share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/history_pk_str.sql > -share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/history_pk_text.sql > -share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/history_pk_uint.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade_log.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade_prepare.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade_str.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade_text.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade_uint.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/with-compression/trends_upgrade.sql > > share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/ > @comment > share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/Makefile > @comment > share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/Makefile.am > @comment > share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/Makefile.in > -share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/history_pk.sql > -share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/history_pk_log.sql > -share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/history_pk_str.sql > -share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/history_pk_text.sql > -share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/history_pk_uint.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade_log.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade_prepare.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade_str.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade_text.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade_uint.sql > +share/zabbix-proxy/schema/postgresql/timescaledb/option-patches/without-compression/trends_upgrade.sql > share/zabbix-proxy/schema/postgresql/timescaledb/schema.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 > @mode 750 > @owner _zabbix > Index: pkg/PLIST-server > =================================================================== > RCS file: /cvs/ports/net/zabbix/pkg/PLIST-server,v > retrieving revision 1.30 > diff -u -p -r1.30 PLIST-server > --- pkg/PLIST-server 12 Dec 2023 10:58:35 -0000 1.30 > +++ pkg/PLIST-server 20 Nov 2024 21:20:07 -0000 > @@ -25,8 +25,7 @@ share/zabbix-server/schema/mysql/option- > @comment share/zabbix-server/schema/mysql/option-patches/Makefile > @comment share/zabbix-server/schema/mysql/option-patches/Makefile.am > @comment share/zabbix-server/schema/mysql/option-patches/Makefile.in > -share/zabbix-server/schema/mysql/option-patches/double.sql > -share/zabbix-server/schema/mysql/option-patches/history_pk_prepare.sql > +share/zabbix-server/schema/mysql/option-patches/history_upgrade_prepare.sql > share/zabbix-server/schema/mysql/schema.sql > share/zabbix-server/schema/postgresql/ > @comment share/zabbix-server/schema/postgresql/Makefile > @@ -38,8 +37,7 @@ share/zabbix-server/schema/postgresql/op > @comment share/zabbix-server/schema/postgresql/option-patches/Makefile > @comment share/zabbix-server/schema/postgresql/option-patches/Makefile.am > @comment share/zabbix-server/schema/postgresql/option-patches/Makefile.in > -share/zabbix-server/schema/postgresql/option-patches/double.sql > -share/zabbix-server/schema/postgresql/option-patches/history_pk_prepare.sql > +share/zabbix-server/schema/postgresql/option-patches/history_upgrade_prepare.sql > share/zabbix-server/schema/postgresql/schema.sql > share/zabbix-server/schema/postgresql/timescaledb/ > @comment share/zabbix-server/schema/postgresql/timescaledb/Makefile > @@ -53,20 +51,24 @@ share/zabbix-server/schema/postgresql/ti > @comment > share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/Makefile > @comment > share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/Makefile.am > @comment > share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/Makefile.in > -share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/history_pk.sql > -share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/history_pk_log.sql > -share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/history_pk_str.sql > -share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/history_pk_text.sql > -share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/history_pk_uint.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade_log.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade_prepare.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade_str.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade_text.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/history_upgrade_uint.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/with-compression/trends_upgrade.sql > > share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/ > @comment > share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/Makefile > @comment > share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/Makefile.am > @comment > share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/Makefile.in > -share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/history_pk.sql > -share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/history_pk_log.sql > -share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/history_pk_str.sql > -share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/history_pk_text.sql > -share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/history_pk_uint.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade_log.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade_prepare.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade_str.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade_text.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/history_upgrade_uint.sql > +share/zabbix-server/schema/postgresql/timescaledb/option-patches/without-compression/trends_upgrade.sql > share/zabbix-server/schema/postgresql/timescaledb/schema.sql > @mode 0755 > @owner _zabbix > Index: pkg/PLIST-web > =================================================================== > RCS file: /cvs/ports/net/zabbix/pkg/PLIST-web,v > retrieving revision 1.62 > diff -u -p -r1.62 PLIST-web > --- pkg/PLIST-web 10 Sep 2024 15:56:13 -0000 1.62 > +++ pkg/PLIST-web 20 Nov 2024 21:20:07 -0000 > @@ -37,6 +37,8 @@ zabbix/app/controllers/CControllerConnec > zabbix/app/controllers/CControllerConnectorUpdate.php > zabbix/app/controllers/CControllerCopyCreate.php > zabbix/app/controllers/CControllerCopyEdit.php > +zabbix/app/controllers/CControllerCorrelationConditionCheck.php > +zabbix/app/controllers/CControllerCorrelationConditionEdit.php > zabbix/app/controllers/CControllerCorrelationCreate.php > zabbix/app/controllers/CControllerCorrelationDelete.php > zabbix/app/controllers/CControllerCorrelationDisable.php > @@ -59,7 +61,9 @@ zabbix/app/controllers/CControllerDashbo > zabbix/app/controllers/CControllerDashboardWidgetEdit.php > zabbix/app/controllers/CControllerDashboardWidgetRfRate.php > zabbix/app/controllers/CControllerDashboardWidgetView.php > -zabbix/app/controllers/CControllerDashboardWidgetsSanitize.php > +zabbix/app/controllers/CControllerDashboardWidgetsValidate.php > +zabbix/app/controllers/CControllerDiscoveryCheckCheck.php > +zabbix/app/controllers/CControllerDiscoveryCheckEdit.php > zabbix/app/controllers/CControllerDiscoveryCreate.php > zabbix/app/controllers/CControllerDiscoveryDelete.php > zabbix/app/controllers/CControllerDiscoveryDisable.php > @@ -80,7 +84,9 @@ zabbix/app/controllers/CControllerHintbo > zabbix/app/controllers/CControllerHost.php > zabbix/app/controllers/CControllerHostCreate.php > zabbix/app/controllers/CControllerHostDashboardView.php > +zabbix/app/controllers/CControllerHostDisable.php > zabbix/app/controllers/CControllerHostEdit.php > +zabbix/app/controllers/CControllerHostEnable.php > zabbix/app/controllers/CControllerHostGroupCreate.php > zabbix/app/controllers/CControllerHostGroupDelete.php > zabbix/app/controllers/CControllerHostGroupDisable.php > @@ -107,7 +113,26 @@ zabbix/app/controllers/CControllerImageD > zabbix/app/controllers/CControllerImageEdit.php > zabbix/app/controllers/CControllerImageList.php > zabbix/app/controllers/CControllerImageUpdate.php > -zabbix/app/controllers/CControllerItemMassCheckNow.php > +zabbix/app/controllers/CControllerItem.php > +zabbix/app/controllers/CControllerItemClear.php > +zabbix/app/controllers/CControllerItemCreate.php > +zabbix/app/controllers/CControllerItemDelete.php > +zabbix/app/controllers/CControllerItemDisable.php > +zabbix/app/controllers/CControllerItemEdit.php > +zabbix/app/controllers/CControllerItemEnable.php > +zabbix/app/controllers/CControllerItemExecuteNow.php > +zabbix/app/controllers/CControllerItemList.php > +zabbix/app/controllers/CControllerItemMassupdate.php > +zabbix/app/controllers/CControllerItemPrototype.php > +zabbix/app/controllers/CControllerItemPrototypeCreate.php > +zabbix/app/controllers/CControllerItemPrototypeDelete.php > +zabbix/app/controllers/CControllerItemPrototypeDisable.php > +zabbix/app/controllers/CControllerItemPrototypeEdit.php > +zabbix/app/controllers/CControllerItemPrototypeEnable.php > +zabbix/app/controllers/CControllerItemPrototypeList.php > +zabbix/app/controllers/CControllerItemPrototypeUpdate.php > +zabbix/app/controllers/CControllerItemTagsList.php > +zabbix/app/controllers/CControllerItemUpdate.php > zabbix/app/controllers/CControllerLatest.php > zabbix/app/controllers/CControllerLatestView.php > zabbix/app/controllers/CControllerLatestViewRefresh.php > @@ -127,17 +152,26 @@ zabbix/app/controllers/CControllerMediat > zabbix/app/controllers/CControllerMediatypeEdit.php > zabbix/app/controllers/CControllerMediatypeEnable.php > zabbix/app/controllers/CControllerMediatypeList.php > +zabbix/app/controllers/CControllerMediatypeMessageCheck.php > +zabbix/app/controllers/CControllerMediatypeMessageEdit.php > +zabbix/app/controllers/CControllerMediatypeTestEdit.php > +zabbix/app/controllers/CControllerMediatypeTestSend.php > zabbix/app/controllers/CControllerMediatypeUpdate.php > zabbix/app/controllers/CControllerMenuPopup.php > +zabbix/app/controllers/CControllerMfaCheck.php > +zabbix/app/controllers/CControllerMfaEdit.php > zabbix/app/controllers/CControllerMiscConfigEdit.php > zabbix/app/controllers/CControllerMiscConfigUpdate.php > +zabbix/app/controllers/CControllerModuleDisable.php > zabbix/app/controllers/CControllerModuleEdit.php > +zabbix/app/controllers/CControllerModuleEnable.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/CControllerNotificationsSnooze.php > zabbix/app/controllers/CControllerPopup.php > zabbix/app/controllers/CControllerPopupAcknowledgeCreate.php > zabbix/app/controllers/CControllerPopupAcknowledgeEdit.php > @@ -145,13 +179,9 @@ zabbix/app/controllers/CControllerPopupA > zabbix/app/controllers/CControllerPopupActionEdit.php > zabbix/app/controllers/CControllerPopupActionOperationEdit.php > zabbix/app/controllers/CControllerPopupActionOperationsList.php > -zabbix/app/controllers/CControllerPopupConditionCommon.php > -zabbix/app/controllers/CControllerPopupConditionEventCorr.php > zabbix/app/controllers/CControllerPopupConditionOperations.php > zabbix/app/controllers/CControllerPopupDashboardShareEdit.php > -zabbix/app/controllers/CControllerPopupDiscoveryCheck.php > zabbix/app/controllers/CControllerPopupGeneric.php > -zabbix/app/controllers/CControllerPopupHttpStep.php > zabbix/app/controllers/CControllerPopupImport.php > zabbix/app/controllers/CControllerPopupImportCompare.php > zabbix/app/controllers/CControllerPopupItemTest.php > @@ -166,17 +196,12 @@ zabbix/app/controllers/CControllerPopupL > zabbix/app/controllers/CControllerPopupLldOverride.php > zabbix/app/controllers/CControllerPopupMassupdateAbstract.php > zabbix/app/controllers/CControllerPopupMassupdateHost.php > -zabbix/app/controllers/CControllerPopupMassupdateItem.php > zabbix/app/controllers/CControllerPopupMassupdateService.php > -zabbix/app/controllers/CControllerPopupMassupdateTemplate.php > -zabbix/app/controllers/CControllerPopupMassupdateTrigger.php > zabbix/app/controllers/CControllerPopupMedia.php > zabbix/app/controllers/CControllerPopupMediaTypeMappingCheck.php > zabbix/app/controllers/CControllerPopupMediaTypeMappingEdit.php > -zabbix/app/controllers/CControllerPopupMediatypeMessage.php > -zabbix/app/controllers/CControllerPopupMediatypeTestEdit.php > -zabbix/app/controllers/CControllerPopupMediatypeTestSend.php > zabbix/app/controllers/CControllerPopupProxyEdit.php > +zabbix/app/controllers/CControllerPopupProxyGroupEdit.php > zabbix/app/controllers/CControllerPopupScheduledReportCreate.php > zabbix/app/controllers/CControllerPopupScheduledReportEdit.php > zabbix/app/controllers/CControllerPopupScheduledReportList.php > @@ -206,6 +231,10 @@ zabbix/app/controllers/CControllerProfil > zabbix/app/controllers/CControllerProxyConfigRefresh.php > zabbix/app/controllers/CControllerProxyCreate.php > zabbix/app/controllers/CControllerProxyDelete.php > +zabbix/app/controllers/CControllerProxyGroupCreate.php > +zabbix/app/controllers/CControllerProxyGroupDelete.php > +zabbix/app/controllers/CControllerProxyGroupList.php > +zabbix/app/controllers/CControllerProxyGroupUpdate.php > zabbix/app/controllers/CControllerProxyHostDisable.php > zabbix/app/controllers/CControllerProxyHostEnable.php > zabbix/app/controllers/CControllerProxyList.php > @@ -232,6 +261,8 @@ zabbix/app/controllers/CControllerScript > zabbix/app/controllers/CControllerScriptEdit.php > zabbix/app/controllers/CControllerScriptList.php > zabbix/app/controllers/CControllerScriptUpdate.php > +zabbix/app/controllers/CControllerScriptUserInputCheck.php > +zabbix/app/controllers/CControllerScriptUserInputEdit.php > zabbix/app/controllers/CControllerSearch.php > zabbix/app/controllers/CControllerServiceCreate.php > zabbix/app/controllers/CControllerServiceDelete.php > @@ -251,26 +282,54 @@ zabbix/app/controllers/CControllerSlaExc > zabbix/app/controllers/CControllerSlaList.php > zabbix/app/controllers/CControllerSlaReportList.php > zabbix/app/controllers/CControllerSlaUpdate.php > +zabbix/app/controllers/CControllerSoftwareVersionCheckGet.php > +zabbix/app/controllers/CControllerSoftwareVersionCheckUpdate.php > zabbix/app/controllers/CControllerSystemWarning.php > zabbix/app/controllers/CControllerTabFilterProfileUpdate.php > +zabbix/app/controllers/CControllerTemplateCreate.php > zabbix/app/controllers/CControllerTemplateDashboardDelete.php > zabbix/app/controllers/CControllerTemplateDashboardEdit.php > zabbix/app/controllers/CControllerTemplateDashboardList.php > zabbix/app/controllers/CControllerTemplateDashboardUpdate.php > +zabbix/app/controllers/CControllerTemplateDelete.php > +zabbix/app/controllers/CControllerTemplateEdit.php > zabbix/app/controllers/CControllerTemplateGroupCreate.php > zabbix/app/controllers/CControllerTemplateGroupDelete.php > zabbix/app/controllers/CControllerTemplateGroupEdit.php > zabbix/app/controllers/CControllerTemplateGroupList.php > zabbix/app/controllers/CControllerTemplateGroupUpdate.php > +zabbix/app/controllers/CControllerTemplateList.php > +zabbix/app/controllers/CControllerTemplateMassupdate.php > +zabbix/app/controllers/CControllerTemplateUpdate.php > +zabbix/app/controllers/CControllerTimeSelectorCalc.php > zabbix/app/controllers/CControllerTimeSelectorUpdate.php > +zabbix/app/controllers/CControllerTimeoutsEdit.php > +zabbix/app/controllers/CControllerTimeoutsUpdate.php > zabbix/app/controllers/CControllerTokenCreate.php > zabbix/app/controllers/CControllerTokenDelete.php > zabbix/app/controllers/CControllerTokenDisable.php > zabbix/app/controllers/CControllerTokenEnable.php > zabbix/app/controllers/CControllerTokenList.php > zabbix/app/controllers/CControllerTokenUpdate.php > +zabbix/app/controllers/CControllerTopTriggersList.php > zabbix/app/controllers/CControllerTrigDisplayEdit.php > zabbix/app/controllers/CControllerTrigDisplayUpdate.php > +zabbix/app/controllers/CControllerTriggerCreate.php > +zabbix/app/controllers/CControllerTriggerDelete.php > +zabbix/app/controllers/CControllerTriggerDisable.php > +zabbix/app/controllers/CControllerTriggerEdit.php > +zabbix/app/controllers/CControllerTriggerEnable.php > +zabbix/app/controllers/CControllerTriggerExpressionConstructor.php > +zabbix/app/controllers/CControllerTriggerList.php > +zabbix/app/controllers/CControllerTriggerMassupdate.php > +zabbix/app/controllers/CControllerTriggerPrototypeCreate.php > +zabbix/app/controllers/CControllerTriggerPrototypeDelete.php > +zabbix/app/controllers/CControllerTriggerPrototypeDisable.php > +zabbix/app/controllers/CControllerTriggerPrototypeEdit.php > +zabbix/app/controllers/CControllerTriggerPrototypeEnable.php > +zabbix/app/controllers/CControllerTriggerPrototypeList.php > +zabbix/app/controllers/CControllerTriggerPrototypeUpdate.php > +zabbix/app/controllers/CControllerTriggerUpdate.php > zabbix/app/controllers/CControllerUserCreate.php > zabbix/app/controllers/CControllerUserDelete.php > zabbix/app/controllers/CControllerUserEdit.php > @@ -279,6 +338,7 @@ zabbix/app/controllers/CControllerUserLi > zabbix/app/controllers/CControllerUserProfileEdit.php > zabbix/app/controllers/CControllerUserProfileUpdate.php > zabbix/app/controllers/CControllerUserProvision.php > +zabbix/app/controllers/CControllerUserResetTotp.php > zabbix/app/controllers/CControllerUserTokenList.php > zabbix/app/controllers/CControllerUserUnblock.php > zabbix/app/controllers/CControllerUserUpdate.php > @@ -286,11 +346,11 @@ zabbix/app/controllers/CControllerUserUp > 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/CControllerUsergroupTemplateGrouprightAdd.php > +zabbix/app/controllers/CControllerUsergroupTagFilterCheck.php > +zabbix/app/controllers/CControllerUsergroupTagFilterEdit.php > +zabbix/app/controllers/CControllerUsergroupTagFilterList.php > zabbix/app/controllers/CControllerUsergroupUpdate.php > zabbix/app/controllers/CControllerUserroleCreate.php > zabbix/app/controllers/CControllerUserroleDelete.php > @@ -298,28 +358,28 @@ zabbix/app/controllers/CControllerUserro > zabbix/app/controllers/CControllerUserroleEditGeneral.php > zabbix/app/controllers/CControllerUserroleList.php > zabbix/app/controllers/CControllerUserroleUpdate.php > +zabbix/app/controllers/CControllerWebScenarioStepCheck.php > +zabbix/app/controllers/CControllerWebScenarioStepEdit.php > zabbix/app/controllers/CControllerWebView.php > zabbix/app/controllers/CControllerWidgetIterator.php > +zabbix/app/controllers/CControllerWidgetNavigationTreeToggle.php > zabbix/app/partials/ > zabbix/app/partials/action.operations.php > zabbix/app/partials/action.recovery.operations.php > zabbix/app/partials/action.update.operations.php > zabbix/app/partials/administration.ha.nodes.php > zabbix/app/partials/administration.system.info.php > -zabbix/app/partials/administration.usergroup.grouprights.html.php > -zabbix/app/partials/administration.usergroup.tagfilters.html.php > -zabbix/app/partials/administration.usergroup.templategrouprights.html.php > -zabbix/app/partials/configuration.filter.items.php > zabbix/app/partials/configuration.host.edit.html.php > zabbix/app/partials/configuration.host.interface.row.php > zabbix/app/partials/configuration.hostgroup.edit.html.php > zabbix/app/partials/configuration.tags.tab.php > zabbix/app/partials/configuration.templategroup.edit.html.php > zabbix/app/partials/configuration.valuemap.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/item.edit.item.tab.php > +zabbix/app/partials/item.edit.preprocessing.tab.php > +zabbix/app/partials/item.list.filter.php > zabbix/app/partials/js/ > zabbix/app/partials/js/configuration.host.edit.html.js.php > zabbix/app/partials/js/configuration.tags.tab.js.php > @@ -345,7 +405,11 @@ zabbix/app/partials/scheduledreport.tabl > zabbix/app/partials/service.info.php > zabbix/app/partials/service.list.edit.php > zabbix/app/partials/service.list.php > +zabbix/app/partials/tags.list.html.php > zabbix/app/partials/timeselector.filter.php > +zabbix/app/partials/trigger.edit.dependencies.tab.php > +zabbix/app/partials/trigger.edit.trigger.tab.php > +zabbix/app/partials/usergroup.tagfilters.php > zabbix/app/views/ > zabbix/app/views/action.list.php > zabbix/app/views/administration.audit.settings.edit.php > @@ -359,12 +423,9 @@ zabbix/app/views/administration.iconmap. > 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.miscconfig.edit.php > -zabbix/app/views/administration.module.edit.php > -zabbix/app/views/administration.module.list.php > zabbix/app/views/administration.proxy.list.php > +zabbix/app/views/administration.proxygroup.list.php > zabbix/app/views/administration.queue.details.php > zabbix/app/views/administration.queue.overview.php > zabbix/app/views/administration.queue.overview.proxy.php > @@ -372,20 +433,14 @@ zabbix/app/views/administration.regex.ed > 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.timeouts.edit.php > zabbix/app/views/administration.token.list.php > zabbix/app/views/administration.trigdisplay.edit.php > zabbix/app/views/administration.user.edit.php > zabbix/app/views/administration.user.list.php > zabbix/app/views/administration.user.token.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.usergroup.templategrouprights.php > zabbix/app/views/administration.userrole.edit.php > zabbix/app/views/administration.userrole.list.php > -zabbix/app/views/configuration.correlation.edit.php > -zabbix/app/views/configuration.correlation.list.php > zabbix/app/views/configuration.dashboard.edit.php > zabbix/app/views/configuration.dashboard.list.php > zabbix/app/views/configuration.discovery.edit.php > @@ -399,11 +454,21 @@ zabbix/app/views/configuration.templateg > zabbix/app/views/connector.edit.php > zabbix/app/views/connector.list.php > zabbix/app/views/copy.edit.php > +zabbix/app/views/correlation.condition.edit.php > +zabbix/app/views/correlation.edit.php > +zabbix/app/views/correlation.list.php > zabbix/app/views/dashboard.page.properties.edit.php > zabbix/app/views/dashboard.properties.edit.php > +zabbix/app/views/discovery.check.edit.php > zabbix/app/views/hintbox.actionlist.php > zabbix/app/views/hintbox.eventlist.php > zabbix/app/views/hostmacros.list.php > +zabbix/app/views/item.edit.php > +zabbix/app/views/item.list.php > +zabbix/app/views/item.massupdate.php > +zabbix/app/views/item.prototype.edit.php > +zabbix/app/views/item.prototype.list.php > +zabbix/app/views/item.tags.list.php > zabbix/app/views/js/ > zabbix/app/views/js/action.list.js.php > zabbix/app/views/js/administration.audit.settings.edit.js.php > @@ -416,25 +481,25 @@ zabbix/app/views/js/administration.iconm > zabbix/app/views/js/administration.image.edit.js.php > zabbix/app/views/js/administration.image.list.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.mediatype.list.js.php > zabbix/app/views/js/administration.miscconfig.edit.js.php > zabbix/app/views/js/administration.proxy.list.js.php > +zabbix/app/views/js/administration.proxygroup.list.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.script.list.js.php > +zabbix/app/views/js/administration.timeouts.edit.js.php > zabbix/app/views/js/administration.token.list.js.php > zabbix/app/views/js/administration.trigdisplay.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.user.list.js.php > zabbix/app/views/js/administration.user.token.list.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.userrole.edit.js.php > -zabbix/app/views/js/configuration.correlation.edit.js.php > zabbix/app/views/js/configuration.dashboard.edit.js.php > +zabbix/app/views/js/configuration.dashboard.list.js.php > zabbix/app/views/js/configuration.discovery.edit.js.php > +zabbix/app/views/js/configuration.discovery.list.js.php > zabbix/app/views/js/configuration.host.edit.js.php > zabbix/app/views/js/configuration.host.list.js.php > zabbix/app/views/js/configuration.hostgroup.edit.js.php > @@ -444,12 +509,28 @@ zabbix/app/views/js/configuration.templa > zabbix/app/views/js/connector.edit.js.php > zabbix/app/views/js/connector.list.js.php > zabbix/app/views/js/copy.edit.js.php > +zabbix/app/views/js/correlation.condition.edit.js.php > +zabbix/app/views/js/correlation.edit.js.php > +zabbix/app/views/js/correlation.list.js.php > +zabbix/app/views/js/discovery.check.edit.js.php > +zabbix/app/views/js/item.edit.js.php > +zabbix/app/views/js/item.list.js.php > +zabbix/app/views/js/item.massupdate.js.php > +zabbix/app/views/js/item.prototype.list.js.php > zabbix/app/views/js/maintenance.edit.js.php > zabbix/app/views/js/maintenance.list.js.php > zabbix/app/views/js/maintenance.timeperiod.edit.js.php > +zabbix/app/views/js/mediatype.edit.js.php > +zabbix/app/views/js/mediatype.list.js.php > +zabbix/app/views/js/mediatype.message.edit.js.php > +zabbix/app/views/js/mediatype.test.edit.js.php > +zabbix/app/views/js/mfa.edit.js.php > +zabbix/app/views/js/module.edit.js.php > +zabbix/app/views/js/module.list.js.php > zabbix/app/views/js/monitoring.charts.view.js.php > zabbix/app/views/js/monitoring.dashboard.print.js.php > zabbix/app/views/js/monitoring.dashboard.view.js.php > +zabbix/app/views/js/monitoring.discovery.view.js.php > zabbix/app/views/js/monitoring.host.dashboard.view.js.php > zabbix/app/views/js/monitoring.host.view.js.php > zabbix/app/views/js/monitoring.latest.view.js.php > @@ -469,17 +550,14 @@ zabbix/app/views/js/popup.import.js.php > zabbix/app/views/js/popup.itemtestedit.view.js.php > zabbix/app/views/js/popup.ldap.edit.js.php > zabbix/app/views/js/popup.ldap.test.edit.js.php > -zabbix/app/views/js/popup.massupdate.item.js.php > zabbix/app/views/js/popup.massupdate.js.php > zabbix/app/views/js/popup.massupdate.macros.js.php > zabbix/app/views/js/popup.massupdate.tmpl.js.php > -zabbix/app/views/js/popup.massupdate.trigger.js.php > zabbix/app/views/js/popup.media.js.php > -zabbix/app/views/js/popup.mediatype.message.js.php > zabbix/app/views/js/popup.mediatypemapping.edit.js.php > -zabbix/app/views/js/popup.mediatypetest.edit.js.php > zabbix/app/views/js/popup.operation.edit.js.php > zabbix/app/views/js/popup.proxy.edit.js.php > +zabbix/app/views/js/popup.proxygroup.edit.js.php > zabbix/app/views/js/popup.scheduledreport.edit.js.php > zabbix/app/views/js/popup.scheduledreport.subscription.js.php > zabbix/app/views/js/popup.scriptexec.js.php > @@ -497,20 +575,40 @@ zabbix/app/views/js/popup.valuemap.edit. > zabbix/app/views/js/reports.actionlog.list.js.php > zabbix/app/views/js/reports.auditlog.list.js.php > zabbix/app/views/js/reports.scheduledreport.edit.js.php > +zabbix/app/views/js/reports.toptriggers.list.js.php > +zabbix/app/views/js/script.userinput.edit.js.php > zabbix/app/views/js/search.js.php > zabbix/app/views/js/service.list.js.php > zabbix/app/views/js/sla.list.js.php > zabbix/app/views/js/slareport.list.js.php > +zabbix/app/views/js/template.edit.js.php > +zabbix/app/views/js/template.list.js.php > +zabbix/app/views/js/trigger.edit.js.php > +zabbix/app/views/js/trigger.list.js.php > +zabbix/app/views/js/trigger.massupdate.js.php > +zabbix/app/views/js/trigger.prototype.list.js.php > +zabbix/app/views/js/usergroup.edit.js.php > +zabbix/app/views/js/usergroup.tagfilter.edit.js.php > +zabbix/app/views/js/webscenario.step.edit.js.php > zabbix/app/views/layout.csv.php > zabbix/app/views/layout.export.php > zabbix/app/views/layout.htmlpage.php > +zabbix/app/views/layout.image.php > zabbix/app/views/layout.javascript.php > zabbix/app/views/layout.json.php > +zabbix/app/views/layout.print.php > zabbix/app/views/layout.warning.php > zabbix/app/views/layout.widget.php > zabbix/app/views/maintenance.edit.php > zabbix/app/views/maintenance.list.php > zabbix/app/views/maintenance.timeperiod.edit.php > +zabbix/app/views/mediatype.edit.php > +zabbix/app/views/mediatype.list.php > +zabbix/app/views/mediatype.message.edit.php > +zabbix/app/views/mediatype.test.edit.php > +zabbix/app/views/mfa.edit.php > +zabbix/app/views/module.edit.php > +zabbix/app/views/module.list.php > zabbix/app/views/monitoring.charts.view.json.php > zabbix/app/views/monitoring.charts.view.php > zabbix/app/views/monitoring.dashboard.list.php > @@ -535,7 +633,6 @@ zabbix/app/views/popup.discovery.check.p > zabbix/app/views/popup.generic.php > zabbix/app/views/popup.host.edit.php > zabbix/app/views/popup.hostgroup.edit.php > -zabbix/app/views/popup.httpstep.php > zabbix/app/views/popup.import.compare.php > zabbix/app/views/popup.import.php > zabbix/app/views/popup.itemtestedit.view.php > @@ -544,16 +641,12 @@ zabbix/app/views/popup.ldap.test.edit.ph > zabbix/app/views/popup.lldoperation.php > zabbix/app/views/popup.lldoverride.php > zabbix/app/views/popup.massupdate.host.php > -zabbix/app/views/popup.massupdate.item.php > zabbix/app/views/popup.massupdate.service.php > -zabbix/app/views/popup.massupdate.template.php > -zabbix/app/views/popup.massupdate.trigger.php > zabbix/app/views/popup.media.php > -zabbix/app/views/popup.mediatype.message.php > zabbix/app/views/popup.mediatypemapping.edit.php > -zabbix/app/views/popup.mediatypetest.edit.php > zabbix/app/views/popup.operation.edit.php > zabbix/app/views/popup.proxy.edit.php > +zabbix/app/views/popup.proxygroup.edit.php > zabbix/app/views/popup.scheduledreport.edit.php > zabbix/app/views/popup.scheduledreport.list.php > zabbix/app/views/popup.scheduledreport.subscription.php > @@ -579,6 +672,8 @@ zabbix/app/views/reports.actionlog.list. > zabbix/app/views/reports.auditlog.list.php > zabbix/app/views/reports.scheduledreport.edit.php > zabbix/app/views/reports.scheduledreport.list.php > +zabbix/app/views/reports.toptriggers.list.php > +zabbix/app/views/script.userinput.edit.php > zabbix/app/views/search.php > zabbix/app/views/service.list.edit.php > zabbix/app/views/service.list.edit.refresh.php > @@ -587,18 +682,35 @@ zabbix/app/views/service.list.refresh.ph > zabbix/app/views/sla.list.php > zabbix/app/views/slareport.list.php > zabbix/app/views/system.warning.php > +zabbix/app/views/template.edit.php > +zabbix/app/views/template.list.php > +zabbix/app/views/template.massupdate.php > +zabbix/app/views/trigger.edit.php > +zabbix/app/views/trigger.expression.constructor.php > +zabbix/app/views/trigger.list.php > +zabbix/app/views/trigger.massupdate.php > +zabbix/app/views/trigger.prototype.edit.php > +zabbix/app/views/trigger.prototype.list.php > +zabbix/app/views/usergroup.edit.php > +zabbix/app/views/usergroup.list.php > +zabbix/app/views/usergroup.tagfilter.edit.php > +zabbix/app/views/usergroup.tagfilter.list.php > +zabbix/app/views/webscenario.step.edit.php > zabbix/app/views/widget.edit.php > zabbix/app/views/widget.view.php > zabbix/assets/ > zabbix/assets/fonts/ > zabbix/assets/fonts/DejaVuSans.ttf > +zabbix/assets/fonts/zabbix-icons.svg > +zabbix/assets/fonts/zabbix-icons.ttf > +zabbix/assets/fonts/zabbix-icons.woff > +zabbix/assets/fonts/zabbix-icons.woff2 > zabbix/assets/img/ > zabbix/assets/img/apple-touch-icon-120x120-precomposed.png > zabbix/assets/img/apple-touch-icon-152x152-precomposed.png > zabbix/assets/img/apple-touch-icon-180x180-precomposed.png > zabbix/assets/img/apple-touch-icon-76x76-precomposed.png > zabbix/assets/img/browser-sprite.png > -zabbix/assets/img/icon-sprite.svg > zabbix/assets/img/ms-tile-144x144.png > zabbix/assets/img/touch-icon-192x192.png > zabbix/assets/styles/ > @@ -641,7 +753,6 @@ zabbix/conf/zabbix.conf.php.example > @group > zabbix/data/ > zabbix/data/top_passwords.txt > -zabbix/disc_prototypes.php > zabbix/favicon.ico > zabbix/graphs.php > zabbix/history.php > @@ -673,9 +784,11 @@ zabbix/include/classes/api/clients/CApiC > zabbix/include/classes/api/clients/CLocalApiClient.php > zabbix/include/classes/api/helpers/ > zabbix/include/classes/api/helpers/CApiHostHelper.php > +zabbix/include/classes/api/helpers/CApiPskHelper.php > zabbix/include/classes/api/helpers/CApiTagHelper.php > zabbix/include/classes/api/item_types/ > zabbix/include/classes/api/item_types/CItemType.php > +zabbix/include/classes/api/item_types/CItemTypeBrowser.php > zabbix/include/classes/api/item_types/CItemTypeCalculated.php > zabbix/include/classes/api/item_types/CItemTypeDbMonitor.php > zabbix/include/classes/api/item_types/CItemTypeDependent.php > @@ -694,7 +807,6 @@ zabbix/include/classes/api/item_types/CI > zabbix/include/classes/api/item_types/CItemTypeZabbix.php > zabbix/include/classes/api/item_types/CItemTypeZabbixActive.php > zabbix/include/classes/api/managers/ > -zabbix/include/classes/api/managers/CDiscoveryRuleManager.php > zabbix/include/classes/api/managers/CGraphManager.php > zabbix/include/classes/api/managers/CGraphPrototypeManager.php > zabbix/include/classes/api/managers/CHistoryManager.php > @@ -737,15 +849,16 @@ zabbix/include/classes/api/services/CIco > zabbix/include/classes/api/services/CImage.php > zabbix/include/classes/api/services/CItem.php > zabbix/include/classes/api/services/CItemGeneral.php > -zabbix/include/classes/api/services/CItemGeneralOld.php > zabbix/include/classes/api/services/CItemPrototype.php > zabbix/include/classes/api/services/CMaintenance.php > 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/CMfa.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/CProxyGroup.php > zabbix/include/classes/api/services/CRegexp.php > zabbix/include/classes/api/services/CReport.php > zabbix/include/classes/api/services/CRole.php > @@ -788,9 +901,11 @@ zabbix/include/classes/core/ConfigFileEx > zabbix/include/classes/core/Manager.php > zabbix/include/classes/core/ZBase.php > zabbix/include/classes/data/ > +zabbix/include/classes/data/CAggFunctionData.php > zabbix/include/classes/data/CHistFunctionData.php > zabbix/include/classes/data/CItemData.php > zabbix/include/classes/data/CMathFunctionData.php > +zabbix/include/classes/data/CWidgetsData.php > zabbix/include/classes/db/ > zabbix/include/classes/db/DB.php > zabbix/include/classes/db/DBException.php > @@ -831,8 +946,16 @@ zabbix/include/classes/helpers/CDataCach > zabbix/include/classes/helpers/CDocHelper.php > zabbix/include/classes/helpers/CElasticsearchHelper.php > zabbix/include/classes/helpers/CEncryptHelper.php > +zabbix/include/classes/helpers/CGraphGeneralHelper.php > +zabbix/include/classes/helpers/CGraphHelper.php > +zabbix/include/classes/helpers/CGraphPrototypeHelper.php > zabbix/include/classes/helpers/CHintBoxHelper.php > +zabbix/include/classes/helpers/CHostPrototypeHelper.php > zabbix/include/classes/helpers/CHousekeepingHelper.php > +zabbix/include/classes/helpers/CItemGeneralHelper.php > +zabbix/include/classes/helpers/CItemHelper.php > +zabbix/include/classes/helpers/CItemPrototypeHelper.php > +zabbix/include/classes/helpers/CLldRuleHelper.php > zabbix/include/classes/helpers/CMaintenanceHelper.php > zabbix/include/classes/helpers/CMapHelper.php > zabbix/include/classes/helpers/CMathHelper.php > @@ -848,11 +971,14 @@ zabbix/include/classes/helpers/CSessionH > zabbix/include/classes/helpers/CSettingsHelper.php > zabbix/include/classes/helpers/CSeverityHelper.php > zabbix/include/classes/helpers/CSlaHelper.php > -zabbix/include/classes/helpers/CSvgGraphHelper.php > zabbix/include/classes/helpers/CSystemInfoHelper.php > zabbix/include/classes/helpers/CTagFilterFieldHelper.php > zabbix/include/classes/helpers/CTemplateHelper.php > +zabbix/include/classes/helpers/CTimePeriodHelper.php > zabbix/include/classes/helpers/CTimezoneHelper.php > +zabbix/include/classes/helpers/CTriggerGeneralHelper.php > +zabbix/include/classes/helpers/CTriggerHelper.php > +zabbix/include/classes/helpers/CTriggerPrototypeHelper.php > zabbix/include/classes/helpers/CUploadFile.php > zabbix/include/classes/helpers/CValueMapHelper.php > zabbix/include/classes/helpers/CViewHelper.php > @@ -865,6 +991,8 @@ zabbix/include/classes/html/CButtonCance > zabbix/include/classes/html/CButtonDelete.php > zabbix/include/classes/html/CButtonDropdown.php > zabbix/include/classes/html/CButtonExport.php > +zabbix/include/classes/html/CButtonIcon.php > +zabbix/include/classes/html/CButtonLink.php > zabbix/include/classes/html/CButtonQMessage.php > zabbix/include/classes/html/CCheckBox.php > zabbix/include/classes/html/CCheckBoxList.php > @@ -880,6 +1008,8 @@ zabbix/include/classes/html/CFilter.php > zabbix/include/classes/html/CForm.php > zabbix/include/classes/html/CFormActions.php > zabbix/include/classes/html/CFormField.php > +zabbix/include/classes/html/CFormFieldset.php > +zabbix/include/classes/html/CFormFieldsetCollapsible.php > zabbix/include/classes/html/CFormGrid.php > zabbix/include/classes/html/CFormList.php > zabbix/include/classes/html/CHorList.php > @@ -888,6 +1018,7 @@ zabbix/include/classes/html/CHtmlEntity. > zabbix/include/classes/html/CHtmlPage.php > zabbix/include/classes/html/CHtmlPageHeader.php > zabbix/include/classes/html/CIFrame.php > +zabbix/include/classes/html/CIcon.php > zabbix/include/classes/html/CImageTextTable.php > zabbix/include/classes/html/CImg.php > zabbix/include/classes/html/CInput.php > @@ -921,7 +1052,6 @@ zabbix/include/classes/html/CSelectOptio > zabbix/include/classes/html/CSelectOptionGroup.php > zabbix/include/classes/html/CSeverity.php > zabbix/include/classes/html/CSimpleButton.php > -zabbix/include/classes/html/CSortable.php > zabbix/include/classes/html/CSpan.php > zabbix/include/classes/html/CSubmit.php > zabbix/include/classes/html/CSubmitButton.php > @@ -949,7 +1079,6 @@ zabbix/include/classes/html/svg/CSvgGrap > zabbix/include/classes/html/svg/CSvgGraphAxis.php > zabbix/include/classes/html/svg/CSvgGraphClipArea.php > zabbix/include/classes/html/svg/CSvgGraphGrid.php > -zabbix/include/classes/html/svg/CSvgGraphLegend.php > zabbix/include/classes/html/svg/CSvgGraphLine.php > zabbix/include/classes/html/svg/CSvgGraphMetricsBar.php > zabbix/include/classes/html/svg/CSvgGraphMetricsLine.php > @@ -966,44 +1095,48 @@ zabbix/include/classes/html/svg/CSvgRect > zabbix/include/classes/html/svg/CSvgTag.php > zabbix/include/classes/html/svg/CSvgText.php > zabbix/include/classes/html/widgets/ > -zabbix/include/classes/html/widgets/CWidgetFieldCheckBoxListView.php > -zabbix/include/classes/html/widgets/CWidgetFieldCheckBoxView.php > -zabbix/include/classes/html/widgets/CWidgetFieldColorView.php > -zabbix/include/classes/html/widgets/CWidgetFieldColumnsListView.php > -zabbix/include/classes/html/widgets/CWidgetFieldDatePickerView.php > -zabbix/include/classes/html/widgets/CWidgetFieldGraphDataSetView.php > -zabbix/include/classes/html/widgets/CWidgetFieldGraphOverrideView.php > -zabbix/include/classes/html/widgets/CWidgetFieldHostPatternSelectView.php > -zabbix/include/classes/html/widgets/CWidgetFieldIntegerBoxView.php > -zabbix/include/classes/html/widgets/CWidgetFieldLatLngView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectActionView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectGraphPrototypeView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectGraphView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectGroupView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectHostView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectItemPrototypeView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectItemView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectMapView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectMediaTypeView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectServiceView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectSlaView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectUserView.php > -zabbix/include/classes/html/widgets/CWidgetFieldMultiSelectView.php > -zabbix/include/classes/html/widgets/CWidgetFieldNumericBoxView.php > -zabbix/include/classes/html/widgets/CWidgetFieldRadioButtonListView.php > -zabbix/include/classes/html/widgets/CWidgetFieldRangeControlView.php > -zabbix/include/classes/html/widgets/CWidgetFieldSelectView.php > -zabbix/include/classes/html/widgets/CWidgetFieldSeveritiesView.php > -zabbix/include/classes/html/widgets/CWidgetFieldTagsView.php > -zabbix/include/classes/html/widgets/CWidgetFieldTextAreaView.php > -zabbix/include/classes/html/widgets/CWidgetFieldTextBoxView.php > -zabbix/include/classes/html/widgets/CWidgetFieldThresholdsView.php > -zabbix/include/classes/html/widgets/CWidgetFieldTimeZoneView.php > -zabbix/include/classes/html/widgets/CWidgetFieldUrlView.php > zabbix/include/classes/html/widgets/CWidgetFieldView.php > -zabbix/include/classes/html/widgets/CWidgetFieldWidgetSelectView.php > +zabbix/include/classes/html/widgets/CWidgetFieldsGroupView.php > +zabbix/include/classes/html/widgets/CWidgetFormFieldsetCollapsibleView.php > zabbix/include/classes/html/widgets/CWidgetFormView.php > zabbix/include/classes/html/widgets/CWidgetView.php > +zabbix/include/classes/html/widgets/fields/ > +zabbix/include/classes/html/widgets/fields/CWidgetFieldCheckBoxListView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldCheckBoxView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldColorView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldColumnsListView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldDatePickerView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldIntegerBoxView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldLatLngView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectActionView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectGraphPrototypeView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectGraphView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectGroupView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectHostView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectItemPrototypeView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectItemView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectMapView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectMediaTypeView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectOverrideHostView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectServiceView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectSlaView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectUserView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldMultiSelectView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldNumericBoxView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldPatternSelectHostView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldPatternSelectItemView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldPatternSelectView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldRadioButtonListView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldRangeControlView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldSelectView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldSeveritiesView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldTagsView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldTextAreaView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldTextBoxView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldThresholdsView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldTimePeriodView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldTimeZoneView.php > +zabbix/include/classes/html/widgets/fields/CWidgetFieldUrlView.php > zabbix/include/classes/import/ > zabbix/include/classes/import/CConfigurationImport.php > zabbix/include/classes/import/CConfigurationImportcompare.php > @@ -1033,6 +1166,7 @@ zabbix/include/classes/import/converters > zabbix/include/classes/import/converters/C54SimpleMacroConverter.php > zabbix/include/classes/import/converters/C60ImportConverter.php > zabbix/include/classes/import/converters/C62ImportConverter.php > +zabbix/include/classes/import/converters/C64ImportConverter.php > zabbix/include/classes/import/converters/CConstantImportConverter.php > zabbix/include/classes/import/converters/CConverter.php > zabbix/include/classes/import/converters/CDefaultImportConverter.php > @@ -1066,12 +1200,14 @@ zabbix/include/classes/import/validators > zabbix/include/classes/import/validators/C60XmlValidator.php > zabbix/include/classes/import/validators/C62XmlValidator.php > zabbix/include/classes/import/validators/C64XmlValidator.php > +zabbix/include/classes/import/validators/C70XmlValidator.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/ldap/ > zabbix/include/classes/ldap/CLdap.php > zabbix/include/classes/macros/ > +zabbix/include/classes/macros/CMacroFunction.php > zabbix/include/classes/macros/CMacrosResolver.php > zabbix/include/classes/macros/CMacrosResolverGeneral.php > zabbix/include/classes/macros/CMacrosResolverHelper.php > @@ -1095,6 +1231,7 @@ zabbix/include/classes/parsers/CADNameAt > zabbix/include/classes/parsers/CAbsoluteTimeParser.php > zabbix/include/classes/parsers/CConditionFormula.php > zabbix/include/classes/parsers/CDnsParser.php > +zabbix/include/classes/parsers/CEscapedStringParser.php > zabbix/include/classes/parsers/CExpressionMacroFunctionParser.php > zabbix/include/classes/parsers/CExpressionMacroParser.php > zabbix/include/classes/parsers/CExpressionParser.php > @@ -1125,13 +1262,13 @@ zabbix/include/classes/parsers/CRangeTim > zabbix/include/classes/parsers/CRangesParser.php > zabbix/include/classes/parsers/CReferenceParser.php > zabbix/include/classes/parsers/CRelativeTimeParser.php > -zabbix/include/classes/parsers/CReplacementParser.php > zabbix/include/classes/parsers/CSchedulingIntervalParser.php > zabbix/include/classes/parsers/CSetParser.php > zabbix/include/classes/parsers/CSimpleIntervalParser.php > zabbix/include/classes/parsers/CTimePeriodParser.php > zabbix/include/classes/parsers/CTimePeriodsParser.php > zabbix/include/classes/parsers/CUpdateIntervalParser.php > +zabbix/include/classes/parsers/CUserMacroFunctionParser.php > zabbix/include/classes/parsers/CUserMacroParser.php > zabbix/include/classes/parsers/CValidationRule.php > zabbix/include/classes/parsers/CVaultSecretParser.php > @@ -1178,7 +1315,6 @@ zabbix/include/classes/user/CWebUser.php > zabbix/include/classes/validators/ > zabbix/include/classes/validators/CActionCondValidator.php > zabbix/include/classes/validators/CApiInputValidator.php > -zabbix/include/classes/validators/CCollectionValidator.php > zabbix/include/classes/validators/CColorValidator.php > zabbix/include/classes/validators/CEmailValidator.php > zabbix/include/classes/validators/CEventCorrCondValidator.php > @@ -1196,15 +1332,10 @@ zabbix/include/classes/validators/CPassw > zabbix/include/classes/validators/CRegexValidator.php > zabbix/include/classes/validators/CStringValidator.php > zabbix/include/classes/validators/CValidator.php > -zabbix/include/classes/validators/event/ > -zabbix/include/classes/validators/event/CEventSourceObjectValidator.php > zabbix/include/classes/validators/host/ > zabbix/include/classes/validators/host/CHostNormalValidator.php > zabbix/include/classes/validators/object/ > -zabbix/include/classes/validators/object/CConditionValidator.php > zabbix/include/classes/validators/object/CUpdateDiscoveredValidator.php > -zabbix/include/classes/validators/schema/ > -zabbix/include/classes/validators/schema/CSchemaValidator.php > zabbix/include/classes/vaults/ > zabbix/include/classes/vaults/CVault.php > zabbix/include/classes/vaults/CVaultCyberArk.php > @@ -1218,9 +1349,6 @@ zabbix/include/classes/widgets/fields/CW > zabbix/include/classes/widgets/fields/CWidgetFieldColor.php > zabbix/include/classes/widgets/fields/CWidgetFieldColumnsList.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/CWidgetFieldHostPatternSelect.php > zabbix/include/classes/widgets/fields/CWidgetFieldIntegerBox.php > zabbix/include/classes/widgets/fields/CWidgetFieldLatLng.php > zabbix/include/classes/widgets/fields/CWidgetFieldMultiSelect.php > @@ -1233,11 +1361,15 @@ zabbix/include/classes/widgets/fields/CW > > zabbix/include/classes/widgets/fields/CWidgetFieldMultiSelectItemPrototype.php > zabbix/include/classes/widgets/fields/CWidgetFieldMultiSelectMap.php > zabbix/include/classes/widgets/fields/CWidgetFieldMultiSelectMediaType.php > +zabbix/include/classes/widgets/fields/CWidgetFieldMultiSelectOverrideHost.php > zabbix/include/classes/widgets/fields/CWidgetFieldMultiSelectService.php > zabbix/include/classes/widgets/fields/CWidgetFieldMultiSelectSla.php > zabbix/include/classes/widgets/fields/CWidgetFieldMultiSelectUser.php > zabbix/include/classes/widgets/fields/CWidgetFieldNavTree.php > zabbix/include/classes/widgets/fields/CWidgetFieldNumericBox.php > +zabbix/include/classes/widgets/fields/CWidgetFieldPatternSelect.php > +zabbix/include/classes/widgets/fields/CWidgetFieldPatternSelectHost.php > +zabbix/include/classes/widgets/fields/CWidgetFieldPatternSelectItem.php > zabbix/include/classes/widgets/fields/CWidgetFieldRadioButtonList.php > zabbix/include/classes/widgets/fields/CWidgetFieldRangeControl.php > zabbix/include/classes/widgets/fields/CWidgetFieldReference.php > @@ -1247,9 +1379,9 @@ zabbix/include/classes/widgets/fields/CW > zabbix/include/classes/widgets/fields/CWidgetFieldTextArea.php > zabbix/include/classes/widgets/fields/CWidgetFieldTextBox.php > zabbix/include/classes/widgets/fields/CWidgetFieldThresholds.php > +zabbix/include/classes/widgets/fields/CWidgetFieldTimePeriod.php > zabbix/include/classes/widgets/fields/CWidgetFieldTimeZone.php > zabbix/include/classes/widgets/fields/CWidgetFieldUrl.php > -zabbix/include/classes/widgets/fields/CWidgetFieldWidgetSelect.php > zabbix/include/classes/xml/ > zabbix/include/classes/xml/CXmlConstantName.php > zabbix/include/classes/xml/CXmlConstantValue.php > @@ -1291,16 +1423,6 @@ zabbix/include/views/configuration.host. > zabbix/include/views/configuration.host.prototype.list.php > zabbix/include/views/configuration.httpconf.edit.php > zabbix/include/views/configuration.httpconf.list.php > -zabbix/include/views/configuration.item.edit.php > -zabbix/include/views/configuration.item.list.php > -zabbix/include/views/configuration.item.prototype.edit.php > -zabbix/include/views/configuration.item.prototype.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.triggers.edit.php > -zabbix/include/views/configuration.triggers.list.php > zabbix/include/views/general.browserwarning.php > zabbix/include/views/general.login.php > zabbix/include/views/general.warning.php > @@ -1309,7 +1431,6 @@ zabbix/include/views/inventory.host.view > zabbix/include/views/js/ > 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/configuration.graph.edit.js.php > zabbix/include/views/js/configuration.graph.list.js.php > zabbix/include/views/js/configuration.host.discovery.edit.js.php > @@ -1319,32 +1440,23 @@ zabbix/include/views/js/configuration.ho > zabbix/include/views/js/configuration.host.prototype.list.js.php > zabbix/include/views/js/configuration.httpconf.edit.js.php > zabbix/include/views/js/configuration.httpconf.list.js.php > -zabbix/include/views/js/configuration.item.edit.js.php > -zabbix/include/views/js/configuration.item.list.js.php > -zabbix/include/views/js/configuration.item.prototype.edit.js.php > -zabbix/include/views/js/configuration.item.prototype.list.js.php > -zabbix/include/views/js/configuration.template.list.js.php > -zabbix/include/views/js/configuration.trigger.prototype.list.js.php > -zabbix/include/views/js/configuration.triggers.edit.js.php > -zabbix/include/views/js/configuration.triggers.list.js.php > -zabbix/include/views/js/editabletable.js.php > zabbix/include/views/js/inventory.host.view.js.php > zabbix/include/views/js/item.preprocessing.js.php > zabbix/include/views/js/itemtest.js.php > +zabbix/include/views/js/mfa.login.js.php > zabbix/include/views/js/monitoring.history.js.php > zabbix/include/views/js/monitoring.sysmap.edit.js.php > zabbix/include/views/js/monitoring.sysmaps.js.php > -zabbix/include/views/js/reports.toptriggers.js.php > zabbix/include/views/js/tr_events.js.php > +zabbix/include/views/mfa.login.php > zabbix/include/views/monitoring.history.php > zabbix/include/views/monitoring.sysmap.constructor.php > zabbix/include/views/monitoring.sysmap.edit.php > zabbix/include/views/monitoring.sysmap.list.php > -zabbix/include/views/reports.toptriggers.php > zabbix/index.php > zabbix/index_http.php > +zabbix/index_mfa.php > zabbix/index_sso.php > -zabbix/items.php > zabbix/js/ > zabbix/js/browsers.js > zabbix/js/chkbxrange.js > @@ -1365,12 +1477,16 @@ zabbix/js/class.cverticalaccordion.js > zabbix/js/class.cviewswitcher.js > zabbix/js/class.dashboard.js > zabbix/js/class.dashboard.page.js > +zabbix/js/class.dashboard.print.js > zabbix/js/class.dashboard.widget.placeholder.js > +zabbix/js/class.event-hub.js > zabbix/js/class.expandable.subfilter.js > +zabbix/js/class.form.fieldset.collapsible.js > zabbix/js/class.geomaps.js > zabbix/js/class.localstorage.js > zabbix/js/class.menu-item.js > zabbix/js/class.menu.js > +zabbix/js/class.navigationtree.js > zabbix/js/class.notification.collection.js > zabbix/js/class.notification.js > zabbix/js/class.notifications.audio.js > @@ -1378,22 +1494,32 @@ zabbix/js/class.notifications.js > zabbix/js/class.overlay.js > zabbix/js/class.overlaycollection.js > zabbix/js/class.rpc.js > +zabbix/js/class.script.js > zabbix/js/class.scrollable.js > zabbix/js/class.sidebar.js > +zabbix/js/class.software-version-check.js > zabbix/js/class.sortable.js > zabbix/js/class.tab-indicators.js > zabbix/js/class.tabfilter.js > zabbix/js/class.tabfilteritem.js > zabbix/js/class.tagfilteritem.js > zabbix/js/class.template.js > +zabbix/js/class.widget-base.js > +zabbix/js/class.widget-field.checkbox-list.js > +zabbix/js/class.widget-field.multiselect.js > +zabbix/js/class.widget-field.time-period.js > +zabbix/js/class.widget-select.popup.js > zabbix/js/class.widget.inaccessible.js > zabbix/js/class.widget.iterator.js > zabbix/js/class.widget.js > +zabbix/js/class.widget.misconfigured.js > zabbix/js/class.widget.paste-placeholder.js > +zabbix/js/class.widgets-data.js > zabbix/js/colorpicker.js > zabbix/js/common.js > zabbix/js/component.z-bar-gauge.js > zabbix/js/component.z-select.js > +zabbix/js/defines.js > zabbix/js/flickerfreescreen.js > zabbix/js/functions.js > zabbix/js/gtlc.js > @@ -1418,6 +1544,9 @@ zabbix/js/vector/ > zabbix/js/vector/class.svg.canvas.js > zabbix/js/vector/class.svg.map.js > zabbix/js/vendors/ > +zabbix/js/vendors/D3/ > +zabbix/js/vendors/D3/LICENSE > +zabbix/js/vendors/D3/d3.js > zabbix/js/vendors/Leaflet/ > zabbix/js/vendors/Leaflet.markercluster/ > zabbix/js/vendors/Leaflet.markercluster/LICENSE > @@ -1430,6 +1559,9 @@ zabbix/js/vendors/jQuery/jquery.js > zabbix/js/vendors/jQueryUI/ > zabbix/js/vendors/jQueryUI/LICENSE > zabbix/js/vendors/jQueryUI/jquery-ui.js > +zabbix/js/vendors/qrcode/ > +zabbix/js/vendors/qrcode/LICENSE > +zabbix/js/vendors/qrcode/qrcode.js > zabbix/jsLoader.php > zabbix/jsrpc.php > zabbix/local/ > @@ -1443,6 +1575,10 @@ zabbix/local/conf/ > zabbix/locale/ > zabbix/locale/README > zabbix/locale/add_new_language.sh > +zabbix/locale/ar/ > +zabbix/locale/ar/LC_MESSAGES/ > +zabbix/locale/ar/LC_MESSAGES/frontend.mo > +zabbix/locale/ar/LC_MESSAGES/frontend.po > zabbix/locale/bg/ > zabbix/locale/bg/LC_MESSAGES/ > zabbix/locale/bg/LC_MESSAGES/frontend.mo > @@ -1467,9 +1603,6 @@ zabbix/locale/el/ > zabbix/locale/el/LC_MESSAGES/ > zabbix/locale/el/LC_MESSAGES/frontend.mo > zabbix/locale/el/LC_MESSAGES/frontend.po > -zabbix/locale/en/ > -zabbix/locale/en/LC_MESSAGES/ > -zabbix/locale/en/LC_MESSAGES/frontend.pot > zabbix/locale/en_GB/ > zabbix/locale/en_GB/LC_MESSAGES/ > zabbix/locale/en_GB/LC_MESSAGES/frontend.mo > @@ -1603,11 +1736,7 @@ zabbix/robots.txt > zabbix/setup.php > zabbix/sysmap.php > zabbix/sysmaps.php > -zabbix/templates.php > -zabbix/toptriggers.php > zabbix/tr_events.php > -zabbix/trigger_prototypes.php > -zabbix/triggers.php > zabbix/vendor/ > zabbix/vendor/autoload.php > zabbix/vendor/bin/ > @@ -1615,6 +1744,7 @@ zabbix/vendor/bin/yaml-lint > zabbix/vendor/bin/yaml-lint.bat > zabbix/vendor/composer/ > zabbix/vendor/composer/ClassLoader.php > +zabbix/vendor/composer/InstalledVersions.php > zabbix/vendor/composer/LICENSE > zabbix/vendor/composer/autoload_classmap.php > zabbix/vendor/composer/autoload_files.php > @@ -1623,6 +1753,52 @@ zabbix/vendor/composer/autoload_psr4.php > zabbix/vendor/composer/autoload_real.php > zabbix/vendor/composer/autoload_static.php > zabbix/vendor/composer/installed.json > +zabbix/vendor/composer/installed.php > +zabbix/vendor/composer/platform_check.php > +zabbix/vendor/duosecurity/ > +zabbix/vendor/duosecurity/duo_universal_php/ > +zabbix/vendor/duosecurity/duo_universal_php/.duo_linting.xml > +zabbix/vendor/duosecurity/duo_universal_php/.github/ > +zabbix/vendor/duosecurity/duo_universal_php/.github/workflows/ > +zabbix/vendor/duosecurity/duo_universal_php/.github/workflows/php_ci.yml > +zabbix/vendor/duosecurity/duo_universal_php/LICENSE > +zabbix/vendor/duosecurity/duo_universal_php/README.md > +zabbix/vendor/duosecurity/duo_universal_php/SECURITY.md > +zabbix/vendor/duosecurity/duo_universal_php/composer.json > +zabbix/vendor/duosecurity/duo_universal_php/example/ > +zabbix/vendor/duosecurity/duo_universal_php/example/README.md > +zabbix/vendor/duosecurity/duo_universal_php/example/composer.json > +zabbix/vendor/duosecurity/duo_universal_php/example/dockerfile > +zabbix/vendor/duosecurity/duo_universal_php/example/duo.conf > +zabbix/vendor/duosecurity/duo_universal_php/example/index.php > +zabbix/vendor/duosecurity/duo_universal_php/example/static/ > +zabbix/vendor/duosecurity/duo_universal_php/example/static/images/ > +zabbix/vendor/duosecurity/duo_universal_php/example/static/images/logo.png > +zabbix/vendor/duosecurity/duo_universal_php/example/static/style.css > +zabbix/vendor/duosecurity/duo_universal_php/example/templates/ > +zabbix/vendor/duosecurity/duo_universal_php/example/templates/login.php > +zabbix/vendor/duosecurity/duo_universal_php/example/templates/success.php > +zabbix/vendor/duosecurity/duo_universal_php/src/ > +zabbix/vendor/duosecurity/duo_universal_php/src/Client.php > +zabbix/vendor/duosecurity/duo_universal_php/src/DuoException.php > +zabbix/vendor/duosecurity/duo_universal_php/src/ca_certs.pem > +zabbix/vendor/duosecurity/duo_universal_php/tests/ > +zabbix/vendor/duosecurity/duo_universal_php/tests/ClientTest.php > +zabbix/vendor/firebase/ > +zabbix/vendor/firebase/php-jwt/ > +zabbix/vendor/firebase/php-jwt/CHANGELOG.md > +zabbix/vendor/firebase/php-jwt/LICENSE > +zabbix/vendor/firebase/php-jwt/README.md > +zabbix/vendor/firebase/php-jwt/composer.json > +zabbix/vendor/firebase/php-jwt/src/ > +zabbix/vendor/firebase/php-jwt/src/BeforeValidException.php > +zabbix/vendor/firebase/php-jwt/src/CachedKeySet.php > +zabbix/vendor/firebase/php-jwt/src/ExpiredException.php > +zabbix/vendor/firebase/php-jwt/src/JWK.php > +zabbix/vendor/firebase/php-jwt/src/JWT.php > +zabbix/vendor/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php > +zabbix/vendor/firebase/php-jwt/src/Key.php > +zabbix/vendor/firebase/php-jwt/src/SignatureInvalidException.php > zabbix/vendor/onelogin/ > zabbix/vendor/onelogin/php-saml/ > zabbix/vendor/onelogin/php-saml/CHANGELOG > @@ -1663,6 +1839,47 @@ zabbix/vendor/onelogin/php-saml/src/Saml > zabbix/vendor/onelogin/php-saml/src/Saml2/schemas/xml.xsd > zabbix/vendor/onelogin/php-saml/src/Saml2/schemas/xmldsig-core-schema.xsd > zabbix/vendor/onelogin/php-saml/src/Saml2/version.json > +zabbix/vendor/paragonie/ > +zabbix/vendor/paragonie/constant_time_encoding/ > +zabbix/vendor/paragonie/constant_time_encoding/LICENSE.txt > +zabbix/vendor/paragonie/constant_time_encoding/README.md > +zabbix/vendor/paragonie/constant_time_encoding/composer.json > +zabbix/vendor/paragonie/constant_time_encoding/src/ > +zabbix/vendor/paragonie/constant_time_encoding/src/Base32.php > +zabbix/vendor/paragonie/constant_time_encoding/src/Base32Hex.php > +zabbix/vendor/paragonie/constant_time_encoding/src/Base64.php > +zabbix/vendor/paragonie/constant_time_encoding/src/Base64DotSlash.php > +zabbix/vendor/paragonie/constant_time_encoding/src/Base64DotSlashOrdered.php > +zabbix/vendor/paragonie/constant_time_encoding/src/Base64UrlSafe.php > +zabbix/vendor/paragonie/constant_time_encoding/src/Binary.php > +zabbix/vendor/paragonie/constant_time_encoding/src/EncoderInterface.php > +zabbix/vendor/paragonie/constant_time_encoding/src/Encoding.php > +zabbix/vendor/paragonie/constant_time_encoding/src/Hex.php > +zabbix/vendor/paragonie/constant_time_encoding/src/RFC4648.php > +zabbix/vendor/pragmarx/ > +zabbix/vendor/pragmarx/google2fa/ > +zabbix/vendor/pragmarx/google2fa/CHANGELOG.md > +zabbix/vendor/pragmarx/google2fa/LICENSE.md > +zabbix/vendor/pragmarx/google2fa/README.md > +zabbix/vendor/pragmarx/google2fa/composer.json > +zabbix/vendor/pragmarx/google2fa/src/ > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/ > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/Contracts/ > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/Contracts/Google2FA.php > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/Contracts/IncompatibleWithGoogleAuthenticator.php > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/Contracts/InvalidAlgorithm.php > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/Contracts/InvalidCharacters.php > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/Contracts/SecretKeyTooShort.php > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/Google2FAException.php > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/IncompatibleWithGoogleAuthenticatorException.php > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/InvalidAlgorithmException.php > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/InvalidCharactersException.php > +zabbix/vendor/pragmarx/google2fa/src/Exceptions/SecretKeyTooShortException.php > +zabbix/vendor/pragmarx/google2fa/src/Google2FA.php > +zabbix/vendor/pragmarx/google2fa/src/Support/ > +zabbix/vendor/pragmarx/google2fa/src/Support/Base32.php > +zabbix/vendor/pragmarx/google2fa/src/Support/Constants.php > +zabbix/vendor/pragmarx/google2fa/src/Support/QRCode.php > zabbix/vendor/robrichards/ > zabbix/vendor/robrichards/xmlseclibs/ > zabbix/vendor/robrichards/xmlseclibs/CHANGELOG.txt > @@ -1748,6 +1965,9 @@ zabbix/widgets/dataover/actions/WidgetVi > zabbix/widgets/dataover/includes/ > zabbix/widgets/dataover/includes/WidgetForm.php > zabbix/widgets/dataover/manifest.json > +zabbix/widgets/dataover/partials/ > +zabbix/widgets/dataover/partials/table.left.php > +zabbix/widgets/dataover/partials/table.top.php > zabbix/widgets/dataover/views/ > zabbix/widgets/dataover/views/widget.edit.php > zabbix/widgets/dataover/views/widget.view.php > @@ -1772,6 +1992,21 @@ zabbix/widgets/favmaps/actions/WidgetVie > zabbix/widgets/favmaps/manifest.json > zabbix/widgets/favmaps/views/ > zabbix/widgets/favmaps/views/widget.view.php > +zabbix/widgets/gauge/ > +zabbix/widgets/gauge/Widget.php > +zabbix/widgets/gauge/actions/ > +zabbix/widgets/gauge/actions/WidgetView.php > +zabbix/widgets/gauge/assets/ > +zabbix/widgets/gauge/assets/js/ > +zabbix/widgets/gauge/assets/js/class.svggauge.js > +zabbix/widgets/gauge/assets/js/class.widget.js > +zabbix/widgets/gauge/includes/ > +zabbix/widgets/gauge/includes/WidgetForm.php > +zabbix/widgets/gauge/manifest.json > +zabbix/widgets/gauge/views/ > +zabbix/widgets/gauge/views/widget.edit.js.php > +zabbix/widgets/gauge/views/widget.edit.php > +zabbix/widgets/gauge/views/widget.view.php > zabbix/widgets/geomap/ > zabbix/widgets/geomap/Widget.php > zabbix/widgets/geomap/actions/ > @@ -1812,6 +2047,21 @@ zabbix/widgets/graphprototype/manifest.j > zabbix/widgets/graphprototype/views/ > zabbix/widgets/graphprototype/views/widget.edit.js.php > zabbix/widgets/graphprototype/views/widget.edit.php > +zabbix/widgets/honeycomb/ > +zabbix/widgets/honeycomb/Widget.php > +zabbix/widgets/honeycomb/actions/ > +zabbix/widgets/honeycomb/actions/WidgetView.php > +zabbix/widgets/honeycomb/assets/ > +zabbix/widgets/honeycomb/assets/js/ > +zabbix/widgets/honeycomb/assets/js/class.svghoneycomb.js > +zabbix/widgets/honeycomb/assets/js/class.widget.js > +zabbix/widgets/honeycomb/includes/ > +zabbix/widgets/honeycomb/includes/WidgetForm.php > +zabbix/widgets/honeycomb/manifest.json > +zabbix/widgets/honeycomb/views/ > +zabbix/widgets/honeycomb/views/widget.edit.js.php > +zabbix/widgets/honeycomb/views/widget.edit.php > +zabbix/widgets/honeycomb/views/widget.view.php > zabbix/widgets/hostavail/ > zabbix/widgets/hostavail/Widget.php > zabbix/widgets/hostavail/actions/ > @@ -1823,8 +2073,26 @@ zabbix/widgets/hostavail/includes/ > zabbix/widgets/hostavail/includes/WidgetForm.php > zabbix/widgets/hostavail/manifest.json > zabbix/widgets/hostavail/views/ > +zabbix/widgets/hostavail/views/widget.edit.js.php > zabbix/widgets/hostavail/views/widget.edit.php > zabbix/widgets/hostavail/views/widget.view.php > +zabbix/widgets/hostnavigator/ > +zabbix/widgets/hostnavigator/Widget.php > +zabbix/widgets/hostnavigator/actions/ > +zabbix/widgets/hostnavigator/actions/WidgetView.php > +zabbix/widgets/hostnavigator/assets/ > +zabbix/widgets/hostnavigator/assets/js/ > +zabbix/widgets/hostnavigator/assets/js/class.hostnavigator.js > +zabbix/widgets/hostnavigator/assets/js/class.widget-field.host-grouping.js > +zabbix/widgets/hostnavigator/assets/js/class.widget.js > +zabbix/widgets/hostnavigator/includes/ > +zabbix/widgets/hostnavigator/includes/CWidgetFieldHostGrouping.php > +zabbix/widgets/hostnavigator/includes/CWidgetFieldHostGroupingView.php > +zabbix/widgets/hostnavigator/includes/WidgetForm.php > +zabbix/widgets/hostnavigator/manifest.json > +zabbix/widgets/hostnavigator/views/ > +zabbix/widgets/hostnavigator/views/widget.edit.php > +zabbix/widgets/hostnavigator/views/widget.view.php > zabbix/widgets/item/ > zabbix/widgets/item/Widget.php > zabbix/widgets/item/actions/ > @@ -1839,6 +2107,45 @@ zabbix/widgets/item/views/ > zabbix/widgets/item/views/widget.edit.js.php > zabbix/widgets/item/views/widget.edit.php > zabbix/widgets/item/views/widget.view.php > +zabbix/widgets/itemhistory/ > +zabbix/widgets/itemhistory/Widget.php > +zabbix/widgets/itemhistory/actions/ > +zabbix/widgets/itemhistory/actions/BinaryValueGet.php > +zabbix/widgets/itemhistory/actions/ColumnEdit.php > +zabbix/widgets/itemhistory/actions/ImageValueGet.php > +zabbix/widgets/itemhistory/actions/ValueCheck.php > +zabbix/widgets/itemhistory/actions/WidgetView.php > +zabbix/widgets/itemhistory/assets/ > +zabbix/widgets/itemhistory/assets/js/ > +zabbix/widgets/itemhistory/assets/js/class.widget.js > +zabbix/widgets/itemhistory/includes/ > +zabbix/widgets/itemhistory/includes/CWidgetFieldColumnsList.php > +zabbix/widgets/itemhistory/includes/CWidgetFieldColumnsListView.php > +zabbix/widgets/itemhistory/includes/WidgetForm.php > +zabbix/widgets/itemhistory/manifest.json > +zabbix/widgets/itemhistory/views/ > +zabbix/widgets/itemhistory/views/column.edit.js.php > +zabbix/widgets/itemhistory/views/column.edit.php > +zabbix/widgets/itemhistory/views/widget.edit.js.php > +zabbix/widgets/itemhistory/views/widget.edit.php > +zabbix/widgets/itemhistory/views/widget.view.php > +zabbix/widgets/itemnavigator/ > +zabbix/widgets/itemnavigator/Widget.php > +zabbix/widgets/itemnavigator/actions/ > +zabbix/widgets/itemnavigator/actions/WidgetView.php > +zabbix/widgets/itemnavigator/assets/ > +zabbix/widgets/itemnavigator/assets/js/ > +zabbix/widgets/itemnavigator/assets/js/class.itemnavigator.js > +zabbix/widgets/itemnavigator/assets/js/class.widget-field.item-grouping.js > +zabbix/widgets/itemnavigator/assets/js/class.widget.js > +zabbix/widgets/itemnavigator/includes/ > +zabbix/widgets/itemnavigator/includes/CWidgetFieldItemGrouping.php > +zabbix/widgets/itemnavigator/includes/CWidgetFieldItemGroupingView.php > +zabbix/widgets/itemnavigator/includes/WidgetForm.php > +zabbix/widgets/itemnavigator/manifest.json > +zabbix/widgets/itemnavigator/views/ > +zabbix/widgets/itemnavigator/views/widget.edit.php > +zabbix/widgets/itemnavigator/views/widget.view.php > zabbix/widgets/map/ > zabbix/widgets/map/Widget.php > zabbix/widgets/map/actions/ > @@ -1871,20 +2178,30 @@ zabbix/widgets/navtree/views/navtreeitem > zabbix/widgets/navtree/views/navtreeitem.edit.php > zabbix/widgets/navtree/views/widget.edit.php > zabbix/widgets/navtree/views/widget.view.php > -zabbix/widgets/plaintext/ > -zabbix/widgets/plaintext/Widget.php > -zabbix/widgets/plaintext/actions/ > -zabbix/widgets/plaintext/actions/WidgetView.php > -zabbix/widgets/plaintext/includes/ > -zabbix/widgets/plaintext/includes/WidgetForm.php > -zabbix/widgets/plaintext/manifest.json > -zabbix/widgets/plaintext/views/ > -zabbix/widgets/plaintext/views/widget.edit.php > -zabbix/widgets/plaintext/views/widget.view.php > +zabbix/widgets/piechart/ > +zabbix/widgets/piechart/Widget.php > +zabbix/widgets/piechart/actions/ > +zabbix/widgets/piechart/actions/WidgetView.php > +zabbix/widgets/piechart/assets/ > +zabbix/widgets/piechart/assets/js/ > +zabbix/widgets/piechart/assets/js/class.svgpie.js > +zabbix/widgets/piechart/assets/js/class.widget.js > +zabbix/widgets/piechart/includes/ > +zabbix/widgets/piechart/includes/CWidgetFieldDataSet.php > +zabbix/widgets/piechart/includes/CWidgetFieldDataSetView.php > +zabbix/widgets/piechart/includes/WidgetForm.php > +zabbix/widgets/piechart/manifest.json > +zabbix/widgets/piechart/views/ > +zabbix/widgets/piechart/views/widget.edit.js.php > +zabbix/widgets/piechart/views/widget.edit.php > +zabbix/widgets/piechart/views/widget.view.php > zabbix/widgets/problemhosts/ > zabbix/widgets/problemhosts/Widget.php > zabbix/widgets/problemhosts/actions/ > zabbix/widgets/problemhosts/actions/WidgetView.php > +zabbix/widgets/problemhosts/assets/ > +zabbix/widgets/problemhosts/assets/js/ > +zabbix/widgets/problemhosts/assets/js/class.widget.js > zabbix/widgets/problemhosts/includes/ > zabbix/widgets/problemhosts/includes/WidgetForm.php > zabbix/widgets/problemhosts/manifest.json > @@ -1939,6 +2256,12 @@ zabbix/widgets/svggraph/assets/ > zabbix/widgets/svggraph/assets/js/ > zabbix/widgets/svggraph/assets/js/class.widget.js > zabbix/widgets/svggraph/includes/ > +zabbix/widgets/svggraph/includes/CSvgGraphHelper.php > +zabbix/widgets/svggraph/includes/CSvgGraphLegend.php > +zabbix/widgets/svggraph/includes/CWidgetFieldDataSet.php > +zabbix/widgets/svggraph/includes/CWidgetFieldDataSetView.php > +zabbix/widgets/svggraph/includes/CWidgetFieldOverride.php > +zabbix/widgets/svggraph/includes/CWidgetFieldOverrideView.php > zabbix/widgets/svggraph/includes/WidgetForm.php > zabbix/widgets/svggraph/manifest.json > zabbix/widgets/svggraph/views/ > @@ -1953,6 +2276,7 @@ zabbix/widgets/systeminfo/includes/ > zabbix/widgets/systeminfo/includes/WidgetForm.php > zabbix/widgets/systeminfo/manifest.json > zabbix/widgets/systeminfo/views/ > +zabbix/widgets/systeminfo/views/widget.edit.js.php > zabbix/widgets/systeminfo/views/widget.edit.php > zabbix/widgets/systeminfo/views/widget.view.php > zabbix/widgets/tophosts/ > @@ -1960,6 +2284,9 @@ zabbix/widgets/tophosts/Widget.php > zabbix/widgets/tophosts/actions/ > zabbix/widgets/tophosts/actions/ColumnEdit.php > zabbix/widgets/tophosts/actions/WidgetView.php > +zabbix/widgets/tophosts/assets/ > +zabbix/widgets/tophosts/assets/js/ > +zabbix/widgets/tophosts/assets/js/class.widget.js > zabbix/widgets/tophosts/includes/ > zabbix/widgets/tophosts/includes/WidgetForm.php > zabbix/widgets/tophosts/manifest.json > @@ -1969,6 +2296,19 @@ zabbix/widgets/tophosts/views/column.edi > zabbix/widgets/tophosts/views/widget.edit.js.php > zabbix/widgets/tophosts/views/widget.edit.php > zabbix/widgets/tophosts/views/widget.view.php > +zabbix/widgets/toptriggers/ > +zabbix/widgets/toptriggers/Widget.php > +zabbix/widgets/toptriggers/actions/ > +zabbix/widgets/toptriggers/actions/WidgetView.php > +zabbix/widgets/toptriggers/assets/ > +zabbix/widgets/toptriggers/assets/js/ > +zabbix/widgets/toptriggers/assets/js/class.widget.js > +zabbix/widgets/toptriggers/includes/ > +zabbix/widgets/toptriggers/includes/WidgetForm.php > +zabbix/widgets/toptriggers/manifest.json > +zabbix/widgets/toptriggers/views/ > +zabbix/widgets/toptriggers/views/widget.edit.php > +zabbix/widgets/toptriggers/views/widget.view.php > zabbix/widgets/trigover/ > zabbix/widgets/trigover/Widget.php > zabbix/widgets/trigover/actions/ > @@ -2003,6 +2343,9 @@ zabbix/widgets/web/ > zabbix/widgets/web/Widget.php > zabbix/widgets/web/actions/ > zabbix/widgets/web/actions/WidgetView.php > +zabbix/widgets/web/assets/ > +zabbix/widgets/web/assets/js/ > +zabbix/widgets/web/assets/js/class.widget.js > zabbix/widgets/web/includes/ > zabbix/widgets/web/includes/WidgetForm.php > zabbix/widgets/web/manifest.json > Index: pkg/README-server > =================================================================== > RCS file: /cvs/ports/net/zabbix/pkg/README-server,v > retrieving revision 1.18 > diff -u -p -r1.18 README-server > --- pkg/README-server 12 Sep 2024 14:16:35 -0000 1.18 > +++ pkg/README-server 20 Nov 2024 21:20:07 -0000 > @@ -92,8 +92,5 @@ automatically created and initialized if > for obvious performance reasons, it is NOT encouraged to use the SQLite > backend for a server. > - # cd ${TRUEPREFIX}/share/zabbix-server/schema/sqlite3 > + # cd ${TRUEPREFIX}/share/zabbix-proxy/schema/sqlite3 > # su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < schema.sql" > -The following steps are not required for setting up a Zabbix Proxy. > - # su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < images.sql" > - # su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < data.sql" > > -- > Mark Patruck ( mark at wrapped.cx ) > GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51 > https://www.wrapped.cx -- Regards, Robert Nagy