FreeBSD Bugzilla – Attachment 197726 Details for
Bug 231895
New ports: net-mgmt/zabbix4-[agent|frontend|java|proxy|server]
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
zabbix4-NEW.patch
zabbix4-NEW.patch (text/plain), 49.23 KB, created by
Danilo G. Baio
on 2018-10-03 02:25:43 UTC
(
hide
)
Description:
zabbix4-NEW.patch
Filename:
MIME Type:
Creator:
Danilo G. Baio
Created:
2018-10-03 02:25:43 UTC
Size:
49.23 KB
patch
obsolete
>Index: net-mgmt/zabbix4-agent/Makefile >=================================================================== >--- net-mgmt/zabbix4-agent/Makefile (revisão 481120) >+++ net-mgmt/zabbix4-agent/Makefile (cópia de trabalho) >@@ -1,11 +1,11 @@ > # Created by: Pakhom Golynga <pg@pakhom.spb.ru> > # $FreeBSD$ > >-PORTNAME= zabbix34 >+PORTNAME= zabbix4 > CATEGORIES= net-mgmt > PKGNAMESUFFIX= -agent > >-MASTERDIR= ${.CURDIR}/../zabbix34-server >+MASTERDIR= ${.CURDIR}/../zabbix4-server > PLIST= ${PKGDIR}/pkg-plist.agent > > OPTIONS_DEFINE= IPV6 >Index: net-mgmt/zabbix4-frontend/Makefile >=================================================================== >--- net-mgmt/zabbix4-frontend/Makefile (revisão 481120) >+++ net-mgmt/zabbix4-frontend/Makefile (cópia de trabalho) >@@ -1,11 +1,11 @@ > # Created by: Pakhom Golynga <pg@pakhom.spb.ru> > # $FreeBSD$ > >-PORTNAME= zabbix34 >+PORTNAME= zabbix4 > CATEGORIES= net-mgmt > PKGNAMESUFFIX= -frontend > >-MASTERDIR= ${.CURDIR}/../zabbix34-server >+MASTERDIR= ${.CURDIR}/../zabbix4-server > > NO_BUILD= yes > NO_ARCH= yes >@@ -16,33 +16,18 @@ > session simplexml snmp sockets xml xmlreader xmlwriter > USES+= php:web > >-OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE >+OPTIONS_DEFINE= MYSQL MYSQLI PGSQL ORACLE > OPTIONS_DEFAULT= MYSQLI > MYSQLI_DESC= MySQLI backend > > MYSQL_VARS= IGNORE_WITH_PHP+="70 71 72" >+MYSQL_USE= PHP=mysql > >-.include <bsd.port.options.mk> >+MYSQLI_USE= PHP=mysqli > >-.if ${PORT_OPTIONS:MMYSQL} >-USE_PHP+= mysql >-.endif >+PGSQL_USE= PHP=pgsql > >-.if ${PORT_OPTIONS:MMYSQLI} >-USE_PHP+= mysqli >-.endif >- >-.if ${PORT_OPTIONS:MPGSQL} >-USE_PHP+= pgsql >-.endif >- >-.if ${PORT_OPTIONS:MSQLITE} >-USE_PHP+= sqlite3 >-.endif >- >-.if ${PORT_OPTIONS:MORACLE} >-CONFIGURE_ARGS+= --with-oracle >-.endif >+ORACLE_CONFIGURE_WITH= oracle > > do-install: > @${MKDIR} ${STAGEDIR}${WWWDIR} >Index: net-mgmt/zabbix4-java/Makefile >=================================================================== >--- net-mgmt/zabbix4-java/Makefile (revisão 481120) >+++ net-mgmt/zabbix4-java/Makefile (cópia de trabalho) >@@ -1,10 +1,10 @@ > # $FreeBSD$ > >-PORTNAME= zabbix34 >+PORTNAME= zabbix4 > CATEGORIES= net-mgmt > PKGNAMESUFFIX= -java > >-MASTERDIR= ${.CURDIR}/../zabbix34-server >+MASTERDIR= ${.CURDIR}/../zabbix4-server > PLIST= ${PKGDIR}/pkg-plist.java > > OPTIONS_DEFINE= IPV6 >Index: net-mgmt/zabbix4-proxy/Makefile >=================================================================== >--- net-mgmt/zabbix4-proxy/Makefile (revisão 481120) >+++ net-mgmt/zabbix4-proxy/Makefile (cópia de trabalho) >@@ -1,10 +1,12 @@ > # Created by: Pakhom Golynga <pg@pakhom.spb.ru> > # $FreeBSD$ > >-PORTNAME= zabbix34 >+PORTNAME= zabbix4 > CATEGORIES= net-mgmt > PKGNAMESUFFIX= -proxy > >-MASTERDIR= ${.CURDIR}/../zabbix34-server >+MASTERDIR= ${.CURDIR}/../zabbix4-server >+ >+OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE > > .include "${MASTERDIR}/Makefile" >Index: net-mgmt/zabbix4-server/Makefile >=================================================================== >--- net-mgmt/zabbix4-server/Makefile (revisão 481120) >+++ net-mgmt/zabbix4-server/Makefile (cópia de trabalho) >@@ -1,8 +1,8 @@ > # Created by: Pakhom Golynga <pg@pakhom.spb.ru> > # $FreeBSD$ > >-PORTNAME= zabbix34 >-PORTVERSION= 3.4.14 >+PORTNAME= zabbix4 >+PORTVERSION= 4.0.0 > PORTREVISION?= 0 > CATEGORIES= net-mgmt > MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} >@@ -10,16 +10,14 @@ > DISTNAME= zabbix-${PORTVERSION} > > MAINTAINER= pg@pakhom.spb.ru >-COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) >+COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS > > LICENSE= GPLv2+ > LICENSE_FILE= ${WRKSRC}/COPYING > > LIB_DEPENDS= libpcre.so:devel/pcre > >-CONFLICTS= zabbix[0-24-9][0-9]${PKGNAMESUFFIX} \ >- zabbix3[0-35-9]${PKGNAMESUFFIX} \ >- zabbix[0-9]${PKGNAMESUFFIX} >+CONFLICTS= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-35-9]${PKGNAMESUFFIX} > > ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} > >@@ -68,7 +66,7 @@ > > CONFIGURE_ARGS+= --with-net-snmp > >-OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2 >+OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC > > OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL > OPTIONS_SUB= yes >@@ -80,12 +78,11 @@ > LDAP_DESC= Support for LDAP server checks > NMAP_DESC= Build/install nmap for o/s detection > SSH_DESC= Support for SSH-based checks >-ODBC_DESC= Support for database checks via ODBC >+UNIXODBC_DESC= Support for database checks via ODBC > LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) > >-OPTIONS_SINGLE= DB ODBC SSL >-OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE >-OPTIONS_SINGLE_ODBC= IODBC UNIXODBC >+OPTIONS_SINGLE= DB SSL >+OPTIONS_SINGLE_DB?= MYSQL PGSQL ORACLE > OPTIONS_SINGLE_SSL= OPENSSL GNUTLS > > MYSQL_CONFIGURE_WITH= mysql >@@ -116,9 +113,6 @@ > SSH_CONFIGURE_WITH= ssh2 > SSH_LIB_DEPENDS= libssh2.so:security/libssh2 > >-IODBC_CONFIGURE_WITH= iodbc >-IODBC_LIB_DEPENDS= libiodbc.so:databases/libiodbc >- > UNIXODBC_CONFIGURE_WITH=unixodbc > UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC > .elif ${ZABBIX_BUILD} == "agent" >@@ -146,55 +140,48 @@ > > post-patch: > @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ >- | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' >+ | ${XARGS} ${REINPLACE_CMD} -e 's#/usr/local/etc#${ETCDIR}#g' >+ > @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ > ${WRKSRC}/conf/zabbix_*.conf \ > ${WRKSRC}/src/zabbix_proxy/proxy.c \ > ${WRKSRC}/src/zabbix_server/server.c > > .if ${ZABBIX_BUILD} == "server" >- @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \ >- ${WRKSRC}/conf/zabbix_server*.conf >- @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ >- ${WRKSRC}/conf/zabbix_server*.conf >+ @${REINPLACE_CMD} -e 's#/tmp/zabbix_server.pid#/var/run/zabbix/zabbix_server.pid#g' \ >+ ${WRKSRC}/conf/zabbix_server.conf \ >+ ${WRKSRC}/src/zabbix_server/server.c > .endif > > .if ${ZABBIX_BUILD} == "proxy" >- @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_proxy.pid#PidFile=/var/run/zabbix/zabbix_proxy.pid#g' \ >- ${WRKSRC}/conf/zabbix_proxy*.conf >- @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ >- ${WRKSRC}/conf/zabbix_proxy*.conf >+ @${REINPLACE_CMD} -e 's#/tmp/zabbix_proxy.pid#/var/run/zabbix/zabbix_proxy.pid#g' \ >+ ${WRKSRC}/conf/zabbix_proxy.conf \ >+ ${WRKSRC}/src/zabbix_proxy/proxy.c > .endif > > .if ${ZABBIX_BUILD} == "agent" >- @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_agentd.pid#PidFile=/var/run/zabbix/zabbix_agentd.pid#g' \ >- ${WRKSRC}/conf/zabbix_agentd*.conf >- @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ >- ${WRKSRC}/conf/zabbix_agentd*.conf >+ @${REINPLACE_CMD} -e 's#/tmp/zabbix_agentd.pid#/var/run/zabbix/zabbix_agentd.pid#g' \ >+ ${WRKSRC}/conf/zabbix_agentd.conf \ >+ ${WRKSRC}/src/zabbix_agent/zabbix_agentd.c > .endif > > .if ${ZABBIX_BUILD} == "java" >- @${REINPLACE_CMD} -e 's#PID_FILE="/tmp/zabbix_java.pid"#PID_FILE="/var/run/zabbix/zabbix_java.pid"#g' \ >+ @${REINPLACE_CMD} -e 's#/tmp/zabbix_java.pid#/var/run/zabbix/zabbix_java.pid#g' \ > ${WRKSRC}/src/zabbix_java/settings.sh > .endif > > .if ${ZABBIX_BUILD} != "agent" > . for d in mysql oracle postgresql sqlite3 > @${REINPLACE_CMD} \ >- -e 's|/bin/ping|/sbin/ping|g' \ > -e 's|/usr/bin/traceroute|/usr/sbin/traceroute|g' \ > -e 's|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g' \ > ${WRKSRC}/database/${d}/data.sql > . endfor > .endif >- @${REINPLACE_CMD} \ >- -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \ >- ${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in > @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ > -exec ${RM} {} + > > post-install: >- > .if ${ZABBIX_BUILD} == "java" > ${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh \ > ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample >@@ -203,12 +190,20 @@ > > .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" > ${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database >- (cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches \ >- ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/upgrades/) >+ @${RM} ${WRKSRC}/database/*/Makefile* > (cd ${WRKSRC}/database/ && \ > ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \ > ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/) >+ >+ ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf \ >+ ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf.sample > .endif >+ >+.if ${ZABBIX_BUILD} == "agent" >+ ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf \ >+ ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf.sample >+.endif >+ > .else # frontend > .include <bsd.port.pre.mk> > .endif >Index: net-mgmt/zabbix4-server/distinfo >=================================================================== >--- net-mgmt/zabbix4-server/distinfo (revisão 481120) >+++ net-mgmt/zabbix4-server/distinfo (cópia de trabalho) >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1537204140 >-SHA256 (zabbix-3.4.14.tar.gz) = 7443873cc970672d3c884230d3aeb082f2d8afcc2b757506c2d684ffdd12d77e >-SIZE (zabbix-3.4.14.tar.gz) = 17476022 >+TIMESTAMP = 1538482288 >+SHA256 (zabbix-4.0.0.tar.gz) = 5673e106156102aff8c6781a890da6cedfc975cf13d96d8749b4c7126f426bc7 >+SIZE (zabbix-4.0.0.tar.gz) = 17984379 >Index: net-mgmt/zabbix4-server/files/pkg-message.in >=================================================================== >--- net-mgmt/zabbix4-server/files/pkg-message.in (revisão 481120) >+++ net-mgmt/zabbix4-server/files/pkg-message.in (cópia de trabalho) >@@ -4,64 +4,36 @@ > > % cd %%DATADIR%%/%%ZABBIX_BUILD%%/database > >-PostgreSQL: >-shell> psql -U <username> >-psql> create database zabbix; >-psql> \q >-shell> cd database/postgresql >-shell> psql -U <username> zabbix < schema.sql >-shell> psql -U <username> zabbix < images.sql >-shell> psql -U <username> zabbix < data.sql >+And follow the instructions: >+https://www.zabbix.com/documentation/4.0/manual/appendix/install/db_scripts > >-MySQL: >-shell> mysql -u<username> -p<password> >-mysql> create database zabbix character set utf8; >-mysql> quit; >-shell> mysql -u<username> -p<password> zabbix < database/mysql/schema.sql >-shell> mysql -u<username> -p<password> zabbix < database/mysql/images.sql >-shell> mysql -u<username> -p<password> zabbix < database/mysql/data.sql >+Upgrade notes for 4.0.0: >+https://www.zabbix.com/documentation/4.0/manual/installation/upgrade_notes_400 > >-SQLite: >-shell> cd database/sqlite3 >-shell> sqlite3 /var/lib/sqlite/zabbix.db < schema.sql >-shell> sqlite3 /var/lib/sqlite/zabbix.db < images.sql >-shell> sqlite3 /var/lib/sqlite/zabbix.db < data.sql >+Upgrade procedure: >+https://www.zabbix.com/documentation/4.0/manual/installation/upgrade/sources > >-IBM DB2: >-shell> db2 "create database zabbix using codeset utf-8 territory us pagesize 32768" >-shell> cd database/ibm_db2 >-shell> db2batch -d zabbix -f schema.sql >-shell> db2batch -d zabbix -f images.sql >-shell> db2batch -d zabbix -f data.sql >- >-Upgrade notes for 3.4.0: >-https://www.zabbix.com/documentation/3.4/manual/installation/upgrade_notes_340 >- >-Upgrade procedure: >-https://www.zabbix.com/documentation/3.4/manual/installation/upgrade >- > Please see https://www.zabbix.com/ for detailed information about Zabbix. > >-On-line Zabbix documentation: >-https://www.zabbix.com/documentation/3.4/start >+Official Zabbix documentation: >+https://www.zabbix.com/documentation/4.0/start > > For Zabbix frontend "Welcome" screen. Enter the user name Admin with password > zabbix to log in as a Zabbix superuser. > > For use NMAP please edit sudoers > ====================================================================== >-This is a Zabbix Standard release! >+This is a Zabbix LTS release! > >-Standard Zabbix releases are supported for Zabbix customers during six (6) >-months of Full Support (general, critical and security issues) until the next >-Zabbix stable release, plus one (1) additional month of Limited Support >-(critical and security issues only). Zabbix Standard version release will >-result in change of the second version number. >+Zabbix LTS releases are supported for Zabbix customers during five (5) years >+i.e. 3 years of Full Support (general, critical and security issues) and 2 >+additional years of Limited Support (critical and security issues only). >+Zabbix LTS version release will result in change of the first version number. > >-Stable release: Zabbix 3.4 >-Release date: August, 2017 >-End of Full Support: February, 2018 >-End of Limited Support: March, 2018 >+Stable release: Zabbix 4.0 >+Release date: 1 October, 2018 >+End of Full Support: 31 October, 2021 >+End of Limited Support: 31 October, 2023 > > Zabbix Life Cycle & Release Policy: > https://www.zabbix.com/life_cycle_and_release_policy >Index: net-mgmt/zabbix4-server/files/zabbix_agentd.in >=================================================================== >Index: net-mgmt/zabbix4-server/files/zabbix_java.in >=================================================================== >Index: net-mgmt/zabbix4-server/files/zabbix_proxy.in >=================================================================== >Index: net-mgmt/zabbix4-server/files/zabbix_server.in >=================================================================== >Index: net-mgmt/zabbix4-server/pkg-descr >=================================================================== >Index: net-mgmt/zabbix4-server/pkg-plist >=================================================================== >--- net-mgmt/zabbix4-server/pkg-plist (revisão 481120) >+++ net-mgmt/zabbix4-server/pkg-plist (cópia de trabalho) >@@ -13,23 +13,6 @@ > %%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/data.sql > %%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/images.sql > %%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/schema.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql/patch.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle/patch.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql/patch.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql/patch.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql/upgrade >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/oracle/patch.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/postgresql/patch.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/ibm_db2/patch.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/ibm_db2/rc4_rc5.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/mysql/patch.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/mysql/rc4_rc5.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/mysql/upgrade >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/oracle/patch.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/oracle/rc4_rc5.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/postgresql/patch.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/postgresql/rc4_rc5.sql >-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.2/README > %%ETCDIR%%/zabbix_%%ZABBIX_BUILD%%.conf.sample > %%PROXY%%@dir %%ETCDIR%%/zabbix_proxy.conf.d > %%SERVER%%@dir %%ETCDIR%%/zabbix_server.conf.d >@@ -37,3 +20,4 @@ > man/man8/zabbix_%%ZABBIX_BUILD%%.8.gz > sbin/zabbix_%%ZABBIX_BUILD%% > @dir %%ETCDIR%%/zabbix/externalscripts >+@dir lib/modules >Index: net-mgmt/zabbix4-server/pkg-plist.agent >=================================================================== >--- net-mgmt/zabbix4-server/pkg-plist.agent (revisão 481120) >+++ net-mgmt/zabbix4-server/pkg-plist.agent (cópia de trabalho) >@@ -6,3 +6,4 @@ > man/man8/zabbix_%%ZABBIX_BUILD%%d.8.gz > sbin/zabbix_agentd > @dir %%ETCDIR%%/zabbix_agentd.conf.d >+@dir lib/modules >Index: net-mgmt/zabbix4-server/pkg-plist.frontend >=================================================================== >--- net-mgmt/zabbix4-server/pkg-plist.frontend (revisão 481120) >+++ net-mgmt/zabbix4-server/pkg-plist.frontend (cópia de trabalho) >@@ -14,16 +14,20 @@ > %%WWWDIR%%/app/.htaccess > %%WWWDIR%%/app/controllers/CControllerAcknowledgeCreate.php > %%WWWDIR%%/app/controllers/CControllerAcknowledgeEdit.php >+%%WWWDIR%%/app/controllers/CControllerAuthenticationEdit.php >+%%WWWDIR%%/app/controllers/CControllerAuthenticationUpdate.php > %%WWWDIR%%/app/controllers/CControllerDashboardAbstract.php > %%WWWDIR%%/app/controllers/CControllerDashboardDelete.php >-%%WWWDIR%%/app/controllers/CControllerDashboardGet.php > %%WWWDIR%%/app/controllers/CControllerDashboardList.php >+%%WWWDIR%%/app/controllers/CControllerDashboardPropertiesCheck.php >+%%WWWDIR%%/app/controllers/CControllerDashboardPropertiesEdit.php >+%%WWWDIR%%/app/controllers/CControllerDashboardShareEdit.php >+%%WWWDIR%%/app/controllers/CControllerDashboardShareUpdate.php > %%WWWDIR%%/app/controllers/CControllerDashboardUpdate.php > %%WWWDIR%%/app/controllers/CControllerDashboardView.php >-%%WWWDIR%%/app/controllers/CControllerDashbrdWidgetCheck.php >-%%WWWDIR%%/app/controllers/CControllerDashbrdWidgetConfig.php >-%%WWWDIR%%/app/controllers/CControllerDashbrdWidgetRfRate.php >-%%WWWDIR%%/app/controllers/CControllerDashbrdWidgetUpdate.php >+%%WWWDIR%%/app/controllers/CControllerDashboardWidgetCheck.php >+%%WWWDIR%%/app/controllers/CControllerDashboardWidgetEdit.php >+%%WWWDIR%%/app/controllers/CControllerDashboardWidgetRfRate.php > %%WWWDIR%%/app/controllers/CControllerDiscoveryView.php > %%WWWDIR%%/app/controllers/CControllerFavouriteCreate.php > %%WWWDIR%%/app/controllers/CControllerFavouriteDelete.php >@@ -35,6 +39,15 @@ > %%WWWDIR%%/app/controllers/CControllerMediatypeEnable.php > %%WWWDIR%%/app/controllers/CControllerMediatypeList.php > %%WWWDIR%%/app/controllers/CControllerMediatypeUpdate.php >+%%WWWDIR%%/app/controllers/CControllerPopupGeneric.php >+%%WWWDIR%%/app/controllers/CControllerPopupHttpStep.php >+%%WWWDIR%%/app/controllers/CControllerPopupMedia.php >+%%WWWDIR%%/app/controllers/CControllerPopupScriptExec.php >+%%WWWDIR%%/app/controllers/CControllerPopupServices.php >+%%WWWDIR%%/app/controllers/CControllerPopupTestTriggerExpr.php >+%%WWWDIR%%/app/controllers/CControllerPopupTrigDescView.php >+%%WWWDIR%%/app/controllers/CControllerPopupTriggerExpr.php >+%%WWWDIR%%/app/controllers/CControllerPopupTriggerWizard.php > %%WWWDIR%%/app/controllers/CControllerProblemView.php > %%WWWDIR%%/app/controllers/CControllerProfileUpdate.php > %%WWWDIR%%/app/controllers/CControllerProxyCreate.php >@@ -52,7 +65,8 @@ > %%WWWDIR%%/app/controllers/CControllerScriptList.php > %%WWWDIR%%/app/controllers/CControllerScriptUpdate.php > %%WWWDIR%%/app/controllers/CControllerSystemWarning.php >-%%WWWDIR%%/app/controllers/CControllerTimelineUpdate.php >+%%WWWDIR%%/app/controllers/CControllerTimeSelectorUpdate.php >+%%WWWDIR%%/app/controllers/CControllerTrigDescUpdate.php > %%WWWDIR%%/app/controllers/CControllerWebView.php > %%WWWDIR%%/app/controllers/CControllerWidget.php > %%WWWDIR%%/app/controllers/CControllerWidgetActionLogView.php >@@ -63,18 +77,21 @@ > %%WWWDIR%%/app/controllers/CControllerWidgetFavMapsView.php > %%WWWDIR%%/app/controllers/CControllerWidgetFavScreensView.php > %%WWWDIR%%/app/controllers/CControllerWidgetGraphView.php >-%%WWWDIR%%/app/controllers/CControllerWidgetHostsView.php >-%%WWWDIR%%/app/controllers/CControllerWidgetNavigationtreeItemEdit.php >-%%WWWDIR%%/app/controllers/CControllerWidgetNavigationtreeItemEditDialog.php >-%%WWWDIR%%/app/controllers/CControllerWidgetNavigationtreeView.php >+%%WWWDIR%%/app/controllers/CControllerWidgetMapView.php >+%%WWWDIR%%/app/controllers/CControllerWidgetNavTreeItemEdit.php >+%%WWWDIR%%/app/controllers/CControllerWidgetNavTreeItemUpdate.php >+%%WWWDIR%%/app/controllers/CControllerWidgetNavTreeView.php > %%WWWDIR%%/app/controllers/CControllerWidgetPlainTextView.php >+%%WWWDIR%%/app/controllers/CControllerWidgetProblemHostsView.php >+%%WWWDIR%%/app/controllers/CControllerWidgetProblemsBySvView.php > %%WWWDIR%%/app/controllers/CControllerWidgetProblemsView.php >-%%WWWDIR%%/app/controllers/CControllerWidgetStatusView.php >-%%WWWDIR%%/app/controllers/CControllerWidgetSysmapView.php >-%%WWWDIR%%/app/controllers/CControllerWidgetSystemView.php >+%%WWWDIR%%/app/controllers/CControllerWidgetSvgGraphView.php >+%%WWWDIR%%/app/controllers/CControllerWidgetSystemInfoView.php > %%WWWDIR%%/app/controllers/CControllerWidgetTrigOverView.php > %%WWWDIR%%/app/controllers/CControllerWidgetUrlView.php > %%WWWDIR%%/app/controllers/CControllerWidgetWebView.php >+%%WWWDIR%%/app/views/administration.authentication.edit.js.php >+%%WWWDIR%%/app/views/administration.authentication.edit.php > %%WWWDIR%%/app/views/administration.mediatype.edit.js.php > %%WWWDIR%%/app/views/administration.mediatype.edit.php > %%WWWDIR%%/app/views/administration.mediatype.list.php >@@ -84,6 +101,8 @@ > %%WWWDIR%%/app/views/administration.script.edit.js.php > %%WWWDIR%%/app/views/administration.script.edit.php > %%WWWDIR%%/app/views/administration.script.list.php >+%%WWWDIR%%/app/views/dashboard.properties.edit.php >+%%WWWDIR%%/app/views/dashboard.sharing.edit.php > %%WWWDIR%%/app/views/layout.csv.php > %%WWWDIR%%/app/views/layout.htmlpage.footer.php > %%WWWDIR%%/app/views/layout.htmlpage.header.php >@@ -96,14 +115,10 @@ > %%WWWDIR%%/app/views/monitoring.acknowledge.edit.js.php > %%WWWDIR%%/app/views/monitoring.acknowledge.edit.php > %%WWWDIR%%/app/views/monitoring.dashboard.breadcrumbs.php >-%%WWWDIR%%/app/views/monitoring.dashboard.config.php >-%%WWWDIR%%/app/views/monitoring.dashboard.edit_form.js.php >-%%WWWDIR%%/app/views/monitoring.dashboard.edit_form.php > %%WWWDIR%%/app/views/monitoring.dashboard.list.php >-%%WWWDIR%%/app/views/monitoring.dashboard.sharing_form.js.php >-%%WWWDIR%%/app/views/monitoring.dashboard.sharing_form.php > %%WWWDIR%%/app/views/monitoring.dashboard.view.js.php > %%WWWDIR%%/app/views/monitoring.dashboard.view.php >+%%WWWDIR%%/app/views/monitoring.dashboard.widget.edit.php > %%WWWDIR%%/app/views/monitoring.discovery.view.php > %%WWWDIR%%/app/views/monitoring.map.view.php > %%WWWDIR%%/app/views/monitoring.problem.view.js.php >@@ -117,16 +132,29 @@ > %%WWWDIR%%/app/views/monitoring.widget.favmaps.view.php > %%WWWDIR%%/app/views/monitoring.widget.favscreens.view.php > %%WWWDIR%%/app/views/monitoring.widget.graph.view.php >-%%WWWDIR%%/app/views/monitoring.widget.hosts.view.php >-%%WWWDIR%%/app/views/monitoring.widget.navigationtree.view.php >+%%WWWDIR%%/app/views/monitoring.widget.map.view.php >+%%WWWDIR%%/app/views/monitoring.widget.navtree.view.php > %%WWWDIR%%/app/views/monitoring.widget.plaintext.view.php >+%%WWWDIR%%/app/views/monitoring.widget.problemhosts.view.php > %%WWWDIR%%/app/views/monitoring.widget.problems.view.php >-%%WWWDIR%%/app/views/monitoring.widget.status.view.php >-%%WWWDIR%%/app/views/monitoring.widget.sysmap.view.php >-%%WWWDIR%%/app/views/monitoring.widget.system.view.php >+%%WWWDIR%%/app/views/monitoring.widget.problemsbysv.view.php >+%%WWWDIR%%/app/views/monitoring.widget.svggraph.view.php >+%%WWWDIR%%/app/views/monitoring.widget.systeminfo.view.php > %%WWWDIR%%/app/views/monitoring.widget.trigover.view.php > %%WWWDIR%%/app/views/monitoring.widget.url.view.php > %%WWWDIR%%/app/views/monitoring.widget.web.view.php >+%%WWWDIR%%/app/views/popup.generic.php >+%%WWWDIR%%/app/views/popup.httpstep.js.php >+%%WWWDIR%%/app/views/popup.httpstep.php >+%%WWWDIR%%/app/views/popup.media.js.php >+%%WWWDIR%%/app/views/popup.media.php >+%%WWWDIR%%/app/views/popup.scriptexec.php >+%%WWWDIR%%/app/views/popup.services.php >+%%WWWDIR%%/app/views/popup.testtriggerexpr.php >+%%WWWDIR%%/app/views/popup.trigdesc.view.php >+%%WWWDIR%%/app/views/popup.triggerexpr.php >+%%WWWDIR%%/app/views/popup.triggerwizard.js.php >+%%WWWDIR%%/app/views/popup.triggerwizard.php > %%WWWDIR%%/app/views/report.services.php > %%WWWDIR%%/app/views/report.status.php > %%WWWDIR%%/app/views/system.warning.php >@@ -140,7 +168,6 @@ > %%WWWDIR%%/audio/no_sound.wav > %%WWWDIR%%/auditacts.php > %%WWWDIR%%/auditlogs.php >-%%WWWDIR%%/authentication.php > %%WWWDIR%%/browserwarning.php > %%WWWDIR%%/chart.php > %%WWWDIR%%/chart2.php >@@ -176,8 +203,8 @@ > %%WWWDIR%%/images/general/no_icon.png > %%WWWDIR%%/images/general/tr_space.gif > %%WWWDIR%%/images/general/tr_top_bottom.gif >-%%WWWDIR%%/images/general/tr_top_right_bottom.gif > %%WWWDIR%%/images/general/tr_top_right.gif >+%%WWWDIR%%/images/general/tr_top_right_bottom.gif > %%WWWDIR%%/images/general/tree/zero.gif > %%WWWDIR%%/img/apple-touch-icon-120x120-precomposed.png > %%WWWDIR%%/img/apple-touch-icon-152x152-precomposed.png >@@ -189,7 +216,6 @@ > %%WWWDIR%%/img/touch-icon-192x192.png > %%WWWDIR%%/imgstore.php > %%WWWDIR%%/include/.htaccess >-%%WWWDIR%%/include/acknow.inc.php > %%WWWDIR%%/include/actions.inc.php > %%WWWDIR%%/include/audit.inc.php > %%WWWDIR%%/include/blocks.inc.php >@@ -199,24 +225,24 @@ > %%WWWDIR%%/include/classes/api/CApiService.php > %%WWWDIR%%/include/classes/api/CApiServiceFactory.php > %%WWWDIR%%/include/classes/api/CAudit.php >+%%WWWDIR%%/include/classes/api/CRelationMap.php > %%WWWDIR%%/include/classes/api/clients/CApiClient.php > %%WWWDIR%%/include/classes/api/clients/CLocalApiClient.php >-%%WWWDIR%%/include/classes/api/CRelationMap.php > %%WWWDIR%%/include/classes/api/managers/CApplicationManager.php > %%WWWDIR%%/include/classes/api/managers/CHistoryManager.php > %%WWWDIR%%/include/classes/api/managers/CHttpTestManager.php >+%%WWWDIR%%/include/classes/api/services/CAPIInfo.php > %%WWWDIR%%/include/classes/api/services/CAction.php > %%WWWDIR%%/include/classes/api/services/CAlert.php >-%%WWWDIR%%/include/classes/api/services/CAPIInfo.php > %%WWWDIR%%/include/classes/api/services/CApplication.php > %%WWWDIR%%/include/classes/api/services/CConfiguration.php > %%WWWDIR%%/include/classes/api/services/CCorrelation.php >-%%WWWDIR%%/include/classes/api/services/CDashboard.php > %%WWWDIR%%/include/classes/api/services/CDCheck.php > %%WWWDIR%%/include/classes/api/services/CDHost.php >-%%WWWDIR%%/include/classes/api/services/CDiscoveryRule.php > %%WWWDIR%%/include/classes/api/services/CDRule.php > %%WWWDIR%%/include/classes/api/services/CDService.php >+%%WWWDIR%%/include/classes/api/services/CDashboard.php >+%%WWWDIR%%/include/classes/api/services/CDiscoveryRule.php > %%WWWDIR%%/include/classes/api/services/CEvent.php > %%WWWDIR%%/include/classes/api/services/CGraph.php > %%WWWDIR%%/include/classes/api/services/CGraphGeneral.php >@@ -245,6 +271,7 @@ > %%WWWDIR%%/include/classes/api/services/CScreenItem.php > %%WWWDIR%%/include/classes/api/services/CScript.php > %%WWWDIR%%/include/classes/api/services/CService.php >+%%WWWDIR%%/include/classes/api/services/CTask.php > %%WWWDIR%%/include/classes/api/services/CTemplate.php > %%WWWDIR%%/include/classes/api/services/CTemplateScreen.php > %%WWWDIR%%/include/classes/api/services/CTemplateScreenItem.php >@@ -255,7 +282,6 @@ > %%WWWDIR%%/include/classes/api/services/CUser.php > %%WWWDIR%%/include/classes/api/services/CUserGroup.php > %%WWWDIR%%/include/classes/api/services/CUserMacro.php >-%%WWWDIR%%/include/classes/api/services/CUserMedia.php > %%WWWDIR%%/include/classes/api/services/CValueMap.php > %%WWWDIR%%/include/classes/api/wrappers/CApiWrapper.php > %%WWWDIR%%/include/classes/api/wrappers/CFrontendApiWrapper.php >@@ -264,16 +290,16 @@ > %%WWWDIR%%/include/classes/core/CConfigFile.php > %%WWWDIR%%/include/classes/core/CHttpRequest.php > %%WWWDIR%%/include/classes/core/CJsonRpc.php >-%%WWWDIR%%/include/classes/core/ConfigFileException.php > %%WWWDIR%%/include/classes/core/CRegistryFactory.php > %%WWWDIR%%/include/classes/core/CSession.php >+%%WWWDIR%%/include/classes/core/ConfigFileException.php > %%WWWDIR%%/include/classes/core/Manager.php > %%WWWDIR%%/include/classes/core/Z.php > %%WWWDIR%%/include/classes/core/ZBase.php > %%WWWDIR%%/include/classes/db/DB.php >+%%WWWDIR%%/include/classes/db/DBException.php > %%WWWDIR%%/include/classes/db/Db2DbBackend.php > %%WWWDIR%%/include/classes/db/DbBackend.php >-%%WWWDIR%%/include/classes/db/DBException.php > %%WWWDIR%%/include/classes/db/MysqlDbBackend.php > %%WWWDIR%%/include/classes/db/OracleDbBackend.php > %%WWWDIR%%/include/classes/db/PostgresqlDbBackend.php >@@ -284,16 +310,19 @@ > %%WWWDIR%%/include/classes/export/writers/CExportWriterFactory.php > %%WWWDIR%%/include/classes/export/writers/CJsonExportWriter.php > %%WWWDIR%%/include/classes/export/writers/CXmlExportWriter.php >+%%WWWDIR%%/include/classes/graph/CSvgGraph.php > %%WWWDIR%%/include/classes/graphdraw/CGraphDraw.php > %%WWWDIR%%/include/classes/graphdraw/CLineGraphDraw.php > %%WWWDIR%%/include/classes/graphdraw/CPieGraphDraw.php > %%WWWDIR%%/include/classes/helpers/CArrayHelper.php >+%%WWWDIR%%/include/classes/helpers/CBrandHelper.php > %%WWWDIR%%/include/classes/helpers/CConditionHelper.php > %%WWWDIR%%/include/classes/helpers/CElasticsearchHelper.php > %%WWWDIR%%/include/classes/helpers/CHtml.php > %%WWWDIR%%/include/classes/helpers/CJs.php > %%WWWDIR%%/include/classes/helpers/CMapHelper.php > %%WWWDIR%%/include/classes/helpers/CMenuPopupHelper.php >+%%WWWDIR%%/include/classes/helpers/CSvgGraphHelper.php > %%WWWDIR%%/include/classes/helpers/CUploadFile.php > %%WWWDIR%%/include/classes/helpers/CViewHelper.php > %%WWWDIR%%/include/classes/html/CActionButtonList.php >@@ -309,17 +338,16 @@ > %%WWWDIR%%/include/classes/html/CColHeader.php > %%WWWDIR%%/include/classes/html/CCollapsibleUiWidget.php > %%WWWDIR%%/include/classes/html/CColor.php >-%%WWWDIR%%/include/classes/html/CColorCell.php > %%WWWDIR%%/include/classes/html/CComboBox.php > %%WWWDIR%%/include/classes/html/CComboItem.php > %%WWWDIR%%/include/classes/html/CDashboardWidgetMap.php >+%%WWWDIR%%/include/classes/html/CDateSelector.php > %%WWWDIR%%/include/classes/html/CDiv.php > %%WWWDIR%%/include/classes/html/CFile.php > %%WWWDIR%%/include/classes/html/CFilter.php > %%WWWDIR%%/include/classes/html/CForm.php > %%WWWDIR%%/include/classes/html/CFormList.php > %%WWWDIR%%/include/classes/html/CHorList.php >-%%WWWDIR%%/include/classes/html/CIcon.php > %%WWWDIR%%/include/classes/html/CIFrame.php > %%WWWDIR%%/include/classes/html/CImageTextTable.php > %%WWWDIR%%/include/classes/html/CImg.php >@@ -327,6 +355,7 @@ > %%WWWDIR%%/include/classes/html/CJsScript.php > %%WWWDIR%%/include/classes/html/CLabel.php > %%WWWDIR%%/include/classes/html/CLink.php >+%%WWWDIR%%/include/classes/html/CLinkAction.php > %%WWWDIR%%/include/classes/html/CList.php > %%WWWDIR%%/include/classes/html/CListBox.php > %%WWWDIR%%/include/classes/html/CListItem.php >@@ -338,6 +367,7 @@ > %%WWWDIR%%/include/classes/html/CPassBox.php > %%WWWDIR%%/include/classes/html/CPre.php > %%WWWDIR%%/include/classes/html/CRadioButtonList.php >+%%WWWDIR%%/include/classes/html/CRangeControl.php > %%WWWDIR%%/include/classes/html/CRedirectButton.php > %%WWWDIR%%/include/classes/html/CRow.php > %%WWWDIR%%/include/classes/html/CRowHeader.php >@@ -347,25 +377,40 @@ > %%WWWDIR%%/include/classes/html/CSubmit.php > %%WWWDIR%%/include/classes/html/CSubmitButton.php > %%WWWDIR%%/include/classes/html/CSup.php >+%%WWWDIR%%/include/classes/html/CTabView.php > %%WWWDIR%%/include/classes/html/CTable.php > %%WWWDIR%%/include/classes/html/CTableInfo.php >-%%WWWDIR%%/include/classes/html/CTabView.php > %%WWWDIR%%/include/classes/html/CTag.php > %%WWWDIR%%/include/classes/html/CTextArea.php > %%WWWDIR%%/include/classes/html/CTextBox.php > %%WWWDIR%%/include/classes/html/CTriggersInfo.php >-%%WWWDIR%%/include/classes/html/CTweenBox.php > %%WWWDIR%%/include/classes/html/CUiWidget.php > %%WWWDIR%%/include/classes/html/CVar.php > %%WWWDIR%%/include/classes/html/CVisibilityBox.php > %%WWWDIR%%/include/classes/html/CWarning.php > %%WWWDIR%%/include/classes/html/interfaces/CButtonInterface.php > %%WWWDIR%%/include/classes/html/pageheader/CPageHeader.php >+%%WWWDIR%%/include/classes/html/svg/CSvg.php >+%%WWWDIR%%/include/classes/html/svg/CSvgCircle.php >+%%WWWDIR%%/include/classes/html/svg/CSvgGraphAnnotation.php >+%%WWWDIR%%/include/classes/html/svg/CSvgGraphArea.php >+%%WWWDIR%%/include/classes/html/svg/CSvgGraphAxis.php >+%%WWWDIR%%/include/classes/html/svg/CSvgGraphGrid.php >+%%WWWDIR%%/include/classes/html/svg/CSvgGraphLegend.php >+%%WWWDIR%%/include/classes/html/svg/CSvgGraphLine.php >+%%WWWDIR%%/include/classes/html/svg/CSvgGraphPoints.php >+%%WWWDIR%%/include/classes/html/svg/CSvgGroup.php >+%%WWWDIR%%/include/classes/html/svg/CSvgLine.php >+%%WWWDIR%%/include/classes/html/svg/CSvgPath.php >+%%WWWDIR%%/include/classes/html/svg/CSvgPolygon.php >+%%WWWDIR%%/include/classes/html/svg/CSvgRect.php >+%%WWWDIR%%/include/classes/html/svg/CSvgTag.php >+%%WWWDIR%%/include/classes/html/svg/CSvgText.php > %%WWWDIR%%/include/classes/html/widget/CWidget.php > %%WWWDIR%%/include/classes/import/CConfigurationImport.php > %%WWWDIR%%/include/classes/import/CImportDataAdapter.php >-%%WWWDIR%%/include/classes/import/CImportedObjectContainer.php > %%WWWDIR%%/include/classes/import/CImportReferencer.php >+%%WWWDIR%%/include/classes/import/CImportedObjectContainer.php > %%WWWDIR%%/include/classes/import/converters/C10ImportConverter.php > %%WWWDIR%%/include/classes/import/converters/C10ItemKeyConverter.php > %%WWWDIR%%/include/classes/import/converters/C10TriggerConverter.php >@@ -374,6 +419,7 @@ > %%WWWDIR%%/include/classes/import/converters/C20TriggerConverter.php > %%WWWDIR%%/include/classes/import/converters/C30ImportConverter.php > %%WWWDIR%%/include/classes/import/converters/C32ImportConverter.php >+%%WWWDIR%%/include/classes/import/converters/C34ImportConverter.php > %%WWWDIR%%/include/classes/import/converters/CConverter.php > %%WWWDIR%%/include/classes/import/converters/CConverterChain.php > %%WWWDIR%%/include/classes/import/converters/CImportConverterFactory.php >@@ -393,6 +439,7 @@ > %%WWWDIR%%/include/classes/import/validators/C30XmlValidator.php > %%WWWDIR%%/include/classes/import/validators/C32XmlValidator.php > %%WWWDIR%%/include/classes/import/validators/C34XmlValidator.php >+%%WWWDIR%%/include/classes/import/validators/C40XmlValidator.php > %%WWWDIR%%/include/classes/import/validators/CXmlValidator.php > %%WWWDIR%%/include/classes/import/validators/CXmlValidatorGeneral.php > %%WWWDIR%%/include/classes/items/CHelpItems.php >@@ -409,22 +456,31 @@ > %%WWWDIR%%/include/classes/mvc/CRouter.php > %%WWWDIR%%/include/classes/mvc/CView.php > %%WWWDIR%%/include/classes/pagefilter/CPageFilter.php >+%%WWWDIR%%/include/classes/parsers/CADNameAttributeParser.php >+%%WWWDIR%%/include/classes/parsers/CAbsoluteTimeParser.php > %%WWWDIR%%/include/classes/parsers/CConditionFormula.php > %%WWWDIR%%/include/classes/parsers/CDnsParser.php > %%WWWDIR%%/include/classes/parsers/CFlexibleIntervalParser.php > %%WWWDIR%%/include/classes/parsers/CFunctionIdParser.php > %%WWWDIR%%/include/classes/parsers/CFunctionMacroParser.php > %%WWWDIR%%/include/classes/parsers/CFunctionParser.php >+%%WWWDIR%%/include/classes/parsers/CHostGroupNameParser.php >+%%WWWDIR%%/include/classes/parsers/CHostNameParser.php > %%WWWDIR%%/include/classes/parsers/CIPParser.php > %%WWWDIR%%/include/classes/parsers/CIPRangeParser.php > %%WWWDIR%%/include/classes/parsers/CIPv4Parser.php > %%WWWDIR%%/include/classes/parsers/CIPv6Parser.php > %%WWWDIR%%/include/classes/parsers/CItemKey.php >+%%WWWDIR%%/include/classes/parsers/CLLDMacroFunctionParser.php > %%WWWDIR%%/include/classes/parsers/CLLDMacroParser.php > %%WWWDIR%%/include/classes/parsers/CMacroFunctionParser.php > %%WWWDIR%%/include/classes/parsers/CMacroParser.php > %%WWWDIR%%/include/classes/parsers/CParser.php >+%%WWWDIR%%/include/classes/parsers/CRangeParser.php >+%%WWWDIR%%/include/classes/parsers/CRangeTimeParser.php >+%%WWWDIR%%/include/classes/parsers/CRangesParser.php > %%WWWDIR%%/include/classes/parsers/CReferenceParser.php >+%%WWWDIR%%/include/classes/parsers/CRelativeTimeParser.php > %%WWWDIR%%/include/classes/parsers/CReplacementParser.php > %%WWWDIR%%/include/classes/parsers/CSchedulingIntervalParser.php > %%WWWDIR%%/include/classes/parsers/CSetParser.php >@@ -450,9 +506,9 @@ > %%WWWDIR%%/include/classes/screens/CScreenEvents.php > %%WWWDIR%%/include/classes/screens/CScreenGraph.php > %%WWWDIR%%/include/classes/screens/CScreenHistory.php >+%%WWWDIR%%/include/classes/screens/CScreenHostTriggers.php > %%WWWDIR%%/include/classes/screens/CScreenHostgroupTriggers.php > %%WWWDIR%%/include/classes/screens/CScreenHostsInfo.php >-%%WWWDIR%%/include/classes/screens/CScreenHostTriggers.php > %%WWWDIR%%/include/classes/screens/CScreenHttpTest.php > %%WWWDIR%%/include/classes/screens/CScreenHttpTestDetails.php > %%WWWDIR%%/include/classes/screens/CScreenLldGraph.php >@@ -484,6 +540,7 @@ > %%WWWDIR%%/include/classes/validators/CColorValidator.php > %%WWWDIR%%/include/classes/validators/CDecimalStringValidator.php > %%WWWDIR%%/include/classes/validators/CDecimalValidator.php >+%%WWWDIR%%/include/classes/validators/CEmailValidator.php > %%WWWDIR%%/include/classes/validators/CFunctionValidator.php > %%WWWDIR%%/include/classes/validators/CHtmlUrlValidator.php > %%WWWDIR%%/include/classes/validators/CIdValidator.php >@@ -496,43 +553,67 @@ > %%WWWDIR%%/include/classes/validators/CValidator.php > %%WWWDIR%%/include/classes/validators/event/CEventSourceObjectValidator.php > %%WWWDIR%%/include/classes/validators/host/CHostNormalValidator.php >-%%WWWDIR%%/include/classes/validators/hostgroup/CHostGroupNameValidator.php >-%%WWWDIR%%/include/classes/validators/hostgroup/CHostGroupNormalValidator.php > %%WWWDIR%%/include/classes/validators/object/CConditionValidator.php > %%WWWDIR%%/include/classes/validators/object/CUpdateDiscoveredValidator.php >-%%WWWDIR%%/include/classes/validators/schema/CPartialSchemaValidator.php > %%WWWDIR%%/include/classes/validators/schema/CSchemaValidator.php >-%%WWWDIR%%/include/classes/validators/string/CLldMacroStringValidator.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetField.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldCheckBox.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldComboBox.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldGroup.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldHidden.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldHost.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldNumericBox.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldRadioButtonList.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldReference.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldSelectResource.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldSeverities.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldTags.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldTextBox.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldUrl.php >-%%WWWDIR%%/include/classes/widgetfields/CWidgetFieldWidgetListComboBox.php >-%%WWWDIR%%/include/classes/widgets/CActionLogWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CClockWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CDataOverviewWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CGraphWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CHostsWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CNavigationWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CPlainTextWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CProblemsWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CSysmapWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CSystemWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CTrigOverviewWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CUrlWidgetForm.php >-%%WWWDIR%%/include/classes/widgets/CWebWidgetForm.php > %%WWWDIR%%/include/classes/widgets/CWidgetConfig.php >-%%WWWDIR%%/include/classes/widgets/CWidgetForm.php >+%%WWWDIR%%/include/classes/widgets/CWidgetHelper.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetField.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldCheckBox.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldComboBox.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldDatePicker.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldGraphDataSet.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldGraphOverride.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldGroup.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldHidden.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldHost.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldIntegerBox.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldItem.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldNumericBox.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldRadioButtonList.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldRangeControl.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldReference.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldSelectResource.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldSeverities.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldTags.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldTextArea.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldTextBox.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldUrl.php >+%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldWidgetListComboBox.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetForm.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormActionLog.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormClock.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormDataOver.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormGraph.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormMap.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormNavTree.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormPlainText.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormProblemHosts.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormProblems.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormProblemsBySv.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormSvgGraph.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormTrigOver.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormUrl.php >+%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormWeb.php >+%%WWWDIR%%/include/classes/widgets/views/widget.actionlog.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.clock.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.dataover.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.discovery.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.favgraphs.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.favmaps.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.favscreens.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.graph.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.map.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.navtree.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.plaintext.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.problemhosts.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.problems.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.problemsbysv.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.svggraph.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.systeminfo.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.trigover.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.url.form.view.php >+%%WWWDIR%%/include/classes/widgets/views/widget.web.form.view.php > %%WWWDIR%%/include/config.inc.php > %%WWWDIR%%/include/correlation.inc.php > %%WWWDIR%%/include/db.inc.php >@@ -574,7 +655,6 @@ > %%WWWDIR%%/include/valuemap.inc.php > %%WWWDIR%%/include/views/administration.auditacts.list.php > %%WWWDIR%%/include/views/administration.auditlogs.list.php >-%%WWWDIR%%/include/views/administration.authentication.edit.php > %%WWWDIR%%/include/views/administration.general.gui.edit.php > %%WWWDIR%%/include/views/administration.general.housekeeper.edit.php > %%WWWDIR%%/include/views/administration.general.iconmap.edit.php >@@ -618,7 +698,6 @@ > %%WWWDIR%%/include/views/configuration.hostgroups.list.php > %%WWWDIR%%/include/views/configuration.httpconf.edit.php > %%WWWDIR%%/include/views/configuration.httpconf.list.php >-%%WWWDIR%%/include/views/configuration.httpconf.popup.php > %%WWWDIR%%/include/views/configuration.item.edit.php > %%WWWDIR%%/include/views/configuration.item.list.php > %%WWWDIR%%/include/views/configuration.item.massupdate.php >@@ -626,7 +705,6 @@ > %%WWWDIR%%/include/views/configuration.item.prototype.list.php > %%WWWDIR%%/include/views/configuration.maintenance.edit.php > %%WWWDIR%%/include/views/configuration.maintenance.list.php >-%%WWWDIR%%/include/views/configuration.services.child.list.php > %%WWWDIR%%/include/views/configuration.services.edit.php > %%WWWDIR%%/include/views/configuration.services.list.php > %%WWWDIR%%/include/views/configuration.services.parent.list.php >@@ -636,12 +714,10 @@ > %%WWWDIR%%/include/views/configuration.trigger.prototype.list.php > %%WWWDIR%%/include/views/configuration.trigger.prototype.massupdate.php > %%WWWDIR%%/include/views/configuration.triggers.edit.php >-%%WWWDIR%%/include/views/configuration.triggers.expression.php > %%WWWDIR%%/include/views/configuration.triggers.list.php > %%WWWDIR%%/include/views/configuration.triggers.massupdate.php > %%WWWDIR%%/include/views/general.browserwarning.php > %%WWWDIR%%/include/views/general.login.php >-%%WWWDIR%%/include/views/general.script.execute.php > %%WWWDIR%%/include/views/general.warning.php > %%WWWDIR%%/include/views/hostmacros.php > %%WWWDIR%%/include/views/inventory.host.list.php >@@ -665,29 +741,25 @@ > %%WWWDIR%%/include/views/js/configuration.graph.edit.js.php > %%WWWDIR%%/include/views/js/configuration.host.discovery.edit.js.php > %%WWWDIR%%/include/views/js/configuration.host.edit.js.php >+%%WWWDIR%%/include/views/js/configuration.host.list.js.php > %%WWWDIR%%/include/views/js/configuration.host.massupdate.js.php > %%WWWDIR%%/include/views/js/configuration.host.prototype.edit.js.php > %%WWWDIR%%/include/views/js/configuration.httpconf.edit.js.php >-%%WWWDIR%%/include/views/js/configuration.httpconf.popup.js.php > %%WWWDIR%%/include/views/js/configuration.item.edit.js.php > %%WWWDIR%%/include/views/js/configuration.item.list.js.php > %%WWWDIR%%/include/views/js/configuration.item.massupdate.js.php > %%WWWDIR%%/include/views/js/configuration.item.prototype.edit.js.php >-%%WWWDIR%%/include/views/js/configuration.services.child.list.js.php >+%%WWWDIR%%/include/views/js/configuration.maintenance.edit.js.php > %%WWWDIR%%/include/views/js/configuration.services.edit.js.php > %%WWWDIR%%/include/views/js/configuration.triggers.edit.js.php >-%%WWWDIR%%/include/views/js/configuration.triggers.expression.js.php > %%WWWDIR%%/include/views/js/configuration.triggers.list.js.php > %%WWWDIR%%/include/views/js/hostmacros.js.php >-%%WWWDIR%%/include/views/js/monitoring.history.js.php > %%WWWDIR%%/include/views/js/monitoring.latest.js.php > %%WWWDIR%%/include/views/js/monitoring.screen.edit.js.php > %%WWWDIR%%/include/views/js/monitoring.slideconf.edit.js.php > %%WWWDIR%%/include/views/js/monitoring.slides.js.php > %%WWWDIR%%/include/views/js/monitoring.sysmap.edit.js.php > %%WWWDIR%%/include/views/js/monitoring.sysmaps.js.php >-%%WWWDIR%%/include/views/js/monitoring.triggerComment.js.php >-%%WWWDIR%%/include/views/js/reports.toptriggers.js.php > %%WWWDIR%%/include/views/monitoring.charts.php > %%WWWDIR%%/include/views/monitoring.history.php > %%WWWDIR%%/include/views/monitoring.hostscreen.php >@@ -704,9 +776,9 @@ > %%WWWDIR%%/include/views/monitoring.sysmap.constructor.php > %%WWWDIR%%/include/views/monitoring.sysmap.edit.php > %%WWWDIR%%/include/views/monitoring.sysmap.list.php >-%%WWWDIR%%/include/views/monitoring.triggerComment.php > %%WWWDIR%%/include/views/reports.toptriggers.php > %%WWWDIR%%/index.php >+%%WWWDIR%%/index_http.php > %%WWWDIR%%/items.php > %%WWWDIR%%/js/browsers.js > %%WWWDIR%%/js/chkbxrange.js >@@ -719,26 +791,31 @@ > %%WWWDIR%%/js/class.cmessages.js > %%WWWDIR%%/js/class.cnavtree.js > %%WWWDIR%%/js/class.cookie.js >+%%WWWDIR%%/js/class.coverride.js >+%%WWWDIR%%/js/class.crangecontrol.js > %%WWWDIR%%/js/class.cscreen.js > %%WWWDIR%%/js/class.csuggest.js >-%%WWWDIR%%/js/class.cswitcher.js >+%%WWWDIR%%/js/class.csvggraph.js > %%WWWDIR%%/js/class.ctree.js > %%WWWDIR%%/js/class.curl.js >+%%WWWDIR%%/js/class.cverticalaccordion.js > %%WWWDIR%%/js/class.cviewswitcher.js > %%WWWDIR%%/js/class.mapWidget.js > %%WWWDIR%%/js/class.pmaster.js > %%WWWDIR%%/js/class.rpc.js >+%%WWWDIR%%/js/colorpicker.js > %%WWWDIR%%/js/common.js >+%%WWWDIR%%/js/csvggraphwidget.js > %%WWWDIR%%/js/dashboard.grid.js > %%WWWDIR%%/js/flickerfreescreen.js > %%WWWDIR%%/js/functions.js > %%WWWDIR%%/js/gtlc.js > %%WWWDIR%%/js/init.js >+%%WWWDIR%%/js/layout.mode.js > %%WWWDIR%%/js/main.js > %%WWWDIR%%/js/menupopup.js > %%WWWDIR%%/js/multiselect.js > %%WWWDIR%%/js/pages/items.js >-%%WWWDIR%%/js/pages/tr_logform.js > %%WWWDIR%%/js/servercheck.js > %%WWWDIR%%/js/vector/class.svg.canvas.js > %%WWWDIR%%/js/vector/class.svg.map.js >@@ -750,6 +827,7 @@ > %%WWWDIR%%/latest.php > %%WWWDIR%%/local/.htaccess > %%WWWDIR%%/local/README >+%%WWWDIR%%/locale/README > %%WWWDIR%%/locale/add_new_language.sh > %%WWWDIR%%/locale/bg/LC_MESSAGES/frontend.mo > %%WWWDIR%%/locale/bg/LC_MESSAGES/frontend.po >@@ -800,7 +878,6 @@ > %%WWWDIR%%/locale/pt_BR/LC_MESSAGES/frontend.po > %%WWWDIR%%/locale/pt_PT/LC_MESSAGES/frontend.mo > %%WWWDIR%%/locale/pt_PT/LC_MESSAGES/frontend.po >-%%WWWDIR%%/locale/README > %%WWWDIR%%/locale/ro/LC_MESSAGES/frontend.mo > %%WWWDIR%%/locale/ro/LC_MESSAGES/frontend.po > %%WWWDIR%%/locale/ru/LC_MESSAGES/frontend.mo >@@ -824,10 +901,6 @@ > %%WWWDIR%%/map.import.php > %%WWWDIR%%/map.php > %%WWWDIR%%/overview.php >-%%WWWDIR%%/popup_httpstep.php >-%%WWWDIR%%/popup_media.php >-%%WWWDIR%%/popup_trexpr.php >-%%WWWDIR%%/popup.php > %%WWWDIR%%/profile.php > %%WWWDIR%%/queue.php > %%WWWDIR%%/report2.php >@@ -837,7 +910,6 @@ > %%WWWDIR%%/screenconf.php > %%WWWDIR%%/screenedit.php > %%WWWDIR%%/screens.php >-%%WWWDIR%%/scripts_exec.php > %%WWWDIR%%/search.php > %%WWWDIR%%/services.php > %%WWWDIR%%/setup.php >@@ -846,15 +918,13 @@ > %%WWWDIR%%/srv_status.php > %%WWWDIR%%/styles/blue-theme.css > %%WWWDIR%%/styles/dark-theme.css >+%%WWWDIR%%/styles/hc-dark.css >+%%WWWDIR%%/styles/hc-light.css > %%WWWDIR%%/sysmap.php > %%WWWDIR%%/sysmaps.php > %%WWWDIR%%/templates.php > %%WWWDIR%%/toptriggers.php >-%%WWWDIR%%/tr_comments.php > %%WWWDIR%%/tr_events.php >-%%WWWDIR%%/tr_logform.php >-%%WWWDIR%%/tr_status.php >-%%WWWDIR%%/tr_testexpr.php > %%WWWDIR%%/trigger_prototypes.php > %%WWWDIR%%/triggers.php > %%WWWDIR%%/usergrps.php >@@ -862,3 +932,4 @@ > %%WWWDIR%%/zabbix.php > @dir %%WWWDIR%%/local/app/controllers > @dir %%WWWDIR%%/local/app/views >+@dir %%WWWDIR%%/local/conf >Index: net-mgmt/zabbix4-server/pkg-plist.java >===================================================================
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
pg:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 231895
: 197726