View | Details | Raw Unified | Return to bug 241235 | Differences between
and this patch

Collapse All | Expand All

(-)net-mgmt/zabbix44-agent/Makefile (-2 / +2 lines)
Lines 1-11 Link Here
1
# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
1
# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	zabbix42
4
PORTNAME=	zabbix44
5
CATEGORIES=	net-mgmt
5
CATEGORIES=	net-mgmt
6
PKGNAMESUFFIX=	-agent
6
PKGNAMESUFFIX=	-agent
7
7
8
MASTERDIR=	${.CURDIR}/../zabbix42-server
8
MASTERDIR=	${.CURDIR}/../zabbix44-server
9
PLIST=		${PKGDIR}/pkg-plist.agent
9
PLIST=		${PKGDIR}/pkg-plist.agent
10
10
11
OPTIONS_DEFINE=		CURL IPV6
11
OPTIONS_DEFINE=		CURL IPV6
(-)net-mgmt/zabbix44-frontend/Makefile (-2 / +2 lines)
Lines 1-11 Link Here
1
# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
1
# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	zabbix42
4
PORTNAME=	zabbix44
5
CATEGORIES=	net-mgmt
5
CATEGORIES=	net-mgmt
6
PKGNAMESUFFIX=	-frontend
6
PKGNAMESUFFIX=	-frontend
7
7
8
MASTERDIR=	${.CURDIR}/../zabbix42-server
8
MASTERDIR=	${.CURDIR}/../zabbix44-server
9
9
10
NO_BUILD=	yes
10
NO_BUILD=	yes
11
NO_ARCH=	yes
11
NO_ARCH=	yes
(-)net-mgmt/zabbix44-java/Makefile (-2 / +2 lines)
Lines 1-10 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	zabbix42
3
PORTNAME=	zabbix44
4
CATEGORIES=	net-mgmt
4
CATEGORIES=	net-mgmt
5
PKGNAMESUFFIX=	-java
5
PKGNAMESUFFIX=	-java
6
6
7
MASTERDIR=	${.CURDIR}/../zabbix42-server
7
MASTERDIR=	${.CURDIR}/../zabbix44-server
8
PLIST=		${PKGDIR}/pkg-plist.java
8
PLIST=		${PKGDIR}/pkg-plist.java
9
9
10
OPTIONS_DEFINE=		IPV6
10
OPTIONS_DEFINE=		IPV6
(-)net-mgmt/zabbix44-proxy/Makefile (-2 / +2 lines)
Lines 1-11 Link Here
1
# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
1
# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	zabbix42
4
PORTNAME=	zabbix44
5
CATEGORIES=	net-mgmt
5
CATEGORIES=	net-mgmt
6
PKGNAMESUFFIX=	-proxy
6
PKGNAMESUFFIX=	-proxy
7
7
8
MASTERDIR=	${.CURDIR}/../zabbix42-server
8
MASTERDIR=	${.CURDIR}/../zabbix44-server
9
9
10
OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE ORACLE
10
OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE ORACLE
11
11
(-)net-mgmt/zabbix44-server/Makefile (-8 / +4 lines)
Lines 1-8 Link Here
1
# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
1
# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	zabbix42
4
PORTNAME=	zabbix44
5
PORTVERSION=	4.2.7
5
PORTVERSION=	4.4.0
6
PORTREVISION?=	0
6
PORTREVISION?=	0
7
CATEGORIES=	net-mgmt
7
CATEGORIES=	net-mgmt
8
MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
8
MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
Lines 18-24 Link Here
18
LIB_DEPENDS=	libpcre.so:devel/pcre
18
LIB_DEPENDS=	libpcre.so:devel/pcre
19
19
20
CONFLICTS=	zabbix[0-35-9][0-9]${PKGNAMESUFFIX} \
20
CONFLICTS=	zabbix[0-35-9][0-9]${PKGNAMESUFFIX} \
21
		zabbix4[0-13-9]${PKGNAMESUFFIX} \
21
		zabbix4[0-35-9]${PKGNAMESUFFIX} \
22
		zabbix[0-9]${PKGNAMESUFFIX}
22
		zabbix[0-9]${PKGNAMESUFFIX}
23
23
24
ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
24
ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
Lines 68-81 Link Here
68
68
69
CONFIGURE_ARGS+=	--with-net-snmp
69
CONFIGURE_ARGS+=	--with-net-snmp
70
70
71
OPTIONS_DEFINE=		IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC
71
OPTIONS_DEFINE=		IPV6 FPING CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC
72
72
73
OPTIONS_DEFAULT=	FPING CURL UNIXODBC MYSQL OPENSSL
73
OPTIONS_DEFAULT=	FPING CURL UNIXODBC MYSQL OPENSSL
74
OPTIONS_SUB=		yes
74
OPTIONS_SUB=		yes
75
75
76
FPING_DESC=		Build/install fping for ping checks
76
FPING_DESC=		Build/install fping for ping checks
77
IPMI_DESC=		Support for IPMI checks
77
IPMI_DESC=		Support for IPMI checks
78
JABBER_DESC=		Support for Jabber media type
79
LDAP_DESC=		Support for LDAP server checks
78
LDAP_DESC=		Support for LDAP server checks
80
NMAP_DESC=		Build/install nmap for o/s detection
79
NMAP_DESC=		Build/install nmap for o/s detection
81
SSH_DESC=		Support for SSH-based checks
80
SSH_DESC=		Support for SSH-based checks
Lines 102-110 Link Here
102
101
103
IPMI_CONFIGURE_WITH=	openipmi
102
IPMI_CONFIGURE_WITH=	openipmi
104
IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
103
IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
105
106
JABBER_CONFIGURE_WITH=	jabber
107
JABBER_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
108
104
109
FPING_RUN_DEPENDS=	fping:net/fping
105
FPING_RUN_DEPENDS=	fping:net/fping
110
106
(-)net-mgmt/zabbix44-server/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1570661295
1
TIMESTAMP = 1570889168
2
SHA256 (zabbix-4.2.7.tar.gz) = 9d9bdf1d858048d72811de04269a429aba257fac2e4b6e782d5a2b1d3a82f627
2
SHA256 (zabbix-4.4.0.tar.gz) = c47da70ea2379684ea6fad91092b819eda6e1955b215b9dd568c061143d78ca8
3
SIZE (zabbix-4.2.7.tar.gz) = 18286402
3
SIZE (zabbix-4.4.0.tar.gz) = 20689807
(-)net-mgmt/zabbix44-server/files/pkg-message.in (-25 / +9 lines)
Lines 7-24 Link Here
7
% cd %%DATADIR%%/%%ZABBIX_BUILD%%/database
7
% cd %%DATADIR%%/%%ZABBIX_BUILD%%/database
8
8
9
And follow the instructions:
9
And follow the instructions:
10
https://www.zabbix.com/documentation/4.2/manual/appendix/install/db_scripts
10
https://www.zabbix.com/documentation/4.4/manual/appendix/install/db_scripts
11
11
12
Upgrade notes for 4.2.0:
12
Upgrade notes for 4.4.0:
13
https://www.zabbix.com/documentation/4.2/manual/installation/upgrade_notes_420
13
https://www.zabbix.com/documentation/4.4/manual/installation/upgrade_notes_440
14
14
15
Upgrade procedure:
15
Upgrade procedure:
16
https://www.zabbix.com/documentation/4.2/manual/installation/upgrade/sources
16
https://www.zabbix.com/documentation/4.4/manual/installation/upgrade/sources
17
17
18
Please see https://www.zabbix.com/ for detailed information about Zabbix.
18
Please see https://www.zabbix.com/ for detailed information about Zabbix.
19
19
20
Official Zabbix documentation:
20
Official Zabbix documentation:
21
https://www.zabbix.com/documentation/4.2/start
21
https://www.zabbix.com/documentation/4.4/start
22
22
23
For Zabbix frontend "Welcome" screen. Enter the user name Admin with password
23
For Zabbix frontend "Welcome" screen. Enter the user name Admin with password
24
zabbix to log in as a Zabbix superuser.
24
zabbix to log in as a Zabbix superuser.
Lines 33-61 Link Here
33
(critical and security issues only). Zabbix Standard version release will result
33
(critical and security issues only). Zabbix Standard version release will result
34
in change of the second version number.
34
in change of the second version number.
35
35
36
Stable release:         Zabbix 4.2
36
Stable release:         Zabbix 4.4
37
Release date:           2 April, 2019
37
Release date:           Q3, 2019
38
End of Full Support:    30 September, 2019
38
End of Full Support:    Q1, 2020
39
End of Limited Support: 31 October, 2019
39
End of Limited Support: Q2, 2020
40
40
41
Zabbix Life Cycle & Release Policy:
41
Zabbix Life Cycle & Release Policy:
42
https://www.zabbix.com/life_cycle_and_release_policy
42
https://www.zabbix.com/life_cycle_and_release_policy
43
EOM
44
}
45
{
46
  type: upgrade
47
  maximum_version: "4.2.6"
48
  minimum_version: "4.2.4"
49
  message: <<EOM
50
A change in Zabbix 4.2.5 is causing trouble when stopping the agent, proxy, and
51
server daemons. If you are using the default rc script and facing this issue,
52
you'll need to send the kill signal to the daemon in order to stop it:
53
54
  # killall -9 zabbix_process_name
55
56
More details at:
57
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239746
58
https://support.zabbix.com/browse/ZBX-16460
59
EOM
43
EOM
60
}
44
}
61
]
45
]
(-)net-mgmt/zabbix44-server/pkg-plist.frontend (-14 / +51 lines)
Lines 16-21 Link Here
16
%%WWWDIR%%/app/controllers/CControllerAcknowledgeEdit.php
16
%%WWWDIR%%/app/controllers/CControllerAcknowledgeEdit.php
17
%%WWWDIR%%/app/controllers/CControllerAuthenticationEdit.php
17
%%WWWDIR%%/app/controllers/CControllerAuthenticationEdit.php
18
%%WWWDIR%%/app/controllers/CControllerAuthenticationUpdate.php
18
%%WWWDIR%%/app/controllers/CControllerAuthenticationUpdate.php
19
%%WWWDIR%%/app/controllers/CControllerAutoregEdit.php
20
%%WWWDIR%%/app/controllers/CControllerAutoregUpdate.php
19
%%WWWDIR%%/app/controllers/CControllerDashboardAbstract.php
21
%%WWWDIR%%/app/controllers/CControllerDashboardAbstract.php
20
%%WWWDIR%%/app/controllers/CControllerDashboardDelete.php
22
%%WWWDIR%%/app/controllers/CControllerDashboardDelete.php
21
%%WWWDIR%%/app/controllers/CControllerDashboardList.php
23
%%WWWDIR%%/app/controllers/CControllerDashboardList.php
Lines 26-31 Link Here
26
%%WWWDIR%%/app/controllers/CControllerDashboardUpdate.php
28
%%WWWDIR%%/app/controllers/CControllerDashboardUpdate.php
27
%%WWWDIR%%/app/controllers/CControllerDashboardView.php
29
%%WWWDIR%%/app/controllers/CControllerDashboardView.php
28
%%WWWDIR%%/app/controllers/CControllerDashboardWidgetCheck.php
30
%%WWWDIR%%/app/controllers/CControllerDashboardWidgetCheck.php
31
%%WWWDIR%%/app/controllers/CControllerDashboardWidgetConfigure.php
29
%%WWWDIR%%/app/controllers/CControllerDashboardWidgetEdit.php
32
%%WWWDIR%%/app/controllers/CControllerDashboardWidgetEdit.php
30
%%WWWDIR%%/app/controllers/CControllerDashboardWidgetRfRate.php
33
%%WWWDIR%%/app/controllers/CControllerDashboardWidgetRfRate.php
31
%%WWWDIR%%/app/controllers/CControllerDiscoveryView.php
34
%%WWWDIR%%/app/controllers/CControllerDiscoveryView.php
Lines 55-61 Link Here
55
%%WWWDIR%%/app/controllers/CControllerPopupScriptExec.php
58
%%WWWDIR%%/app/controllers/CControllerPopupScriptExec.php
56
%%WWWDIR%%/app/controllers/CControllerPopupServices.php
59
%%WWWDIR%%/app/controllers/CControllerPopupServices.php
57
%%WWWDIR%%/app/controllers/CControllerPopupTestTriggerExpr.php
60
%%WWWDIR%%/app/controllers/CControllerPopupTestTriggerExpr.php
58
%%WWWDIR%%/app/controllers/CControllerPopupTrigDescView.php
59
%%WWWDIR%%/app/controllers/CControllerPopupTriggerExpr.php
61
%%WWWDIR%%/app/controllers/CControllerPopupTriggerExpr.php
60
%%WWWDIR%%/app/controllers/CControllerPopupTriggerWizard.php
62
%%WWWDIR%%/app/controllers/CControllerPopupTriggerWizard.php
61
%%WWWDIR%%/app/controllers/CControllerProblemView.php
63
%%WWWDIR%%/app/controllers/CControllerProblemView.php
Lines 77-83 Link Here
77
%%WWWDIR%%/app/controllers/CControllerSearch.php
79
%%WWWDIR%%/app/controllers/CControllerSearch.php
78
%%WWWDIR%%/app/controllers/CControllerSystemWarning.php
80
%%WWWDIR%%/app/controllers/CControllerSystemWarning.php
79
%%WWWDIR%%/app/controllers/CControllerTimeSelectorUpdate.php
81
%%WWWDIR%%/app/controllers/CControllerTimeSelectorUpdate.php
80
%%WWWDIR%%/app/controllers/CControllerTrigDescUpdate.php
82
%%WWWDIR%%/app/controllers/CControllerUserCreate.php
83
%%WWWDIR%%/app/controllers/CControllerUserDelete.php
84
%%WWWDIR%%/app/controllers/CControllerUserEdit.php
85
%%WWWDIR%%/app/controllers/CControllerUserEditGeneral.php
86
%%WWWDIR%%/app/controllers/CControllerUserList.php
87
%%WWWDIR%%/app/controllers/CControllerUserProfileEdit.php
88
%%WWWDIR%%/app/controllers/CControllerUserProfileUpdate.php
89
%%WWWDIR%%/app/controllers/CControllerUserUnblock.php
90
%%WWWDIR%%/app/controllers/CControllerUserUpdate.php
91
%%WWWDIR%%/app/controllers/CControllerUserUpdateGeneral.php
81
%%WWWDIR%%/app/controllers/CControllerWebView.php
92
%%WWWDIR%%/app/controllers/CControllerWebView.php
82
%%WWWDIR%%/app/controllers/CControllerWidget.php
93
%%WWWDIR%%/app/controllers/CControllerWidget.php
83
%%WWWDIR%%/app/controllers/CControllerWidgetActionLogView.php
94
%%WWWDIR%%/app/controllers/CControllerWidgetActionLogView.php
Lines 88-93 Link Here
88
%%WWWDIR%%/app/controllers/CControllerWidgetFavMapsView.php
99
%%WWWDIR%%/app/controllers/CControllerWidgetFavMapsView.php
89
%%WWWDIR%%/app/controllers/CControllerWidgetFavScreensView.php
100
%%WWWDIR%%/app/controllers/CControllerWidgetFavScreensView.php
90
%%WWWDIR%%/app/controllers/CControllerWidgetGraphView.php
101
%%WWWDIR%%/app/controllers/CControllerWidgetGraphView.php
102
%%WWWDIR%%/app/controllers/CControllerWidgetHostAvailView.php
103
%%WWWDIR%%/app/controllers/CControllerWidgetIterator.php
104
%%WWWDIR%%/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php
91
%%WWWDIR%%/app/controllers/CControllerWidgetMapView.php
105
%%WWWDIR%%/app/controllers/CControllerWidgetMapView.php
92
%%WWWDIR%%/app/controllers/CControllerWidgetNavTreeItemEdit.php
106
%%WWWDIR%%/app/controllers/CControllerWidgetNavTreeItemEdit.php
93
%%WWWDIR%%/app/controllers/CControllerWidgetNavTreeItemUpdate.php
107
%%WWWDIR%%/app/controllers/CControllerWidgetNavTreeItemUpdate.php
Lines 103-108 Link Here
103
%%WWWDIR%%/app/controllers/CControllerWidgetWebView.php
117
%%WWWDIR%%/app/controllers/CControllerWidgetWebView.php
104
%%WWWDIR%%/app/views/administration.authentication.edit.js.php
118
%%WWWDIR%%/app/views/administration.authentication.edit.js.php
105
%%WWWDIR%%/app/views/administration.authentication.edit.php
119
%%WWWDIR%%/app/views/administration.authentication.edit.php
120
%%WWWDIR%%/app/views/administration.autoreg.edit.js.php
121
%%WWWDIR%%/app/views/administration.autoreg.edit.php
106
%%WWWDIR%%/app/views/administration.mediatype.edit.js.php
122
%%WWWDIR%%/app/views/administration.mediatype.edit.js.php
107
%%WWWDIR%%/app/views/administration.mediatype.edit.php
123
%%WWWDIR%%/app/views/administration.mediatype.edit.php
108
%%WWWDIR%%/app/views/administration.mediatype.list.php
124
%%WWWDIR%%/app/views/administration.mediatype.list.php
Lines 112-117 Link Here
112
%%WWWDIR%%/app/views/administration.script.edit.js.php
128
%%WWWDIR%%/app/views/administration.script.edit.js.php
113
%%WWWDIR%%/app/views/administration.script.edit.php
129
%%WWWDIR%%/app/views/administration.script.edit.php
114
%%WWWDIR%%/app/views/administration.script.list.php
130
%%WWWDIR%%/app/views/administration.script.list.php
131
%%WWWDIR%%/app/views/administration.user.edit.common.js.php
132
%%WWWDIR%%/app/views/administration.user.edit.js.php
133
%%WWWDIR%%/app/views/administration.user.edit.php
134
%%WWWDIR%%/app/views/administration.user.list.php
135
%%WWWDIR%%/app/views/administration.userprofile.edit.js.php
115
%%WWWDIR%%/app/views/dashboard.properties.edit.php
136
%%WWWDIR%%/app/views/dashboard.properties.edit.php
116
%%WWWDIR%%/app/views/dashboard.sharing.edit.php
137
%%WWWDIR%%/app/views/dashboard.sharing.edit.php
117
%%WWWDIR%%/app/views/layout.csv.php
138
%%WWWDIR%%/app/views/layout.csv.php
Lines 144-149 Link Here
144
%%WWWDIR%%/app/views/monitoring.widget.favmaps.view.php
165
%%WWWDIR%%/app/views/monitoring.widget.favmaps.view.php
145
%%WWWDIR%%/app/views/monitoring.widget.favscreens.view.php
166
%%WWWDIR%%/app/views/monitoring.widget.favscreens.view.php
146
%%WWWDIR%%/app/views/monitoring.widget.graph.view.php
167
%%WWWDIR%%/app/views/monitoring.widget.graph.view.php
168
%%WWWDIR%%/app/views/monitoring.widget.hostavail.view.php
147
%%WWWDIR%%/app/views/monitoring.widget.map.view.php
169
%%WWWDIR%%/app/views/monitoring.widget.map.view.php
148
%%WWWDIR%%/app/views/monitoring.widget.navtree.view.php
170
%%WWWDIR%%/app/views/monitoring.widget.navtree.view.php
149
%%WWWDIR%%/app/views/monitoring.widget.plaintext.view.php
171
%%WWWDIR%%/app/views/monitoring.widget.plaintext.view.php
Lines 166-172 Link Here
166
%%WWWDIR%%/app/views/popup.scriptexec.php
188
%%WWWDIR%%/app/views/popup.scriptexec.php
167
%%WWWDIR%%/app/views/popup.services.php
189
%%WWWDIR%%/app/views/popup.services.php
168
%%WWWDIR%%/app/views/popup.testtriggerexpr.php
190
%%WWWDIR%%/app/views/popup.testtriggerexpr.php
169
%%WWWDIR%%/app/views/popup.trigdesc.view.php
170
%%WWWDIR%%/app/views/popup.triggerexpr.php
191
%%WWWDIR%%/app/views/popup.triggerexpr.php
171
%%WWWDIR%%/app/views/popup.triggerwizard.js.php
192
%%WWWDIR%%/app/views/popup.triggerwizard.js.php
172
%%WWWDIR%%/app/views/popup.triggerwizard.php
193
%%WWWDIR%%/app/views/popup.triggerwizard.php
Lines 254-259 Link Here
254
%%WWWDIR%%/include/classes/api/services/CAlert.php
275
%%WWWDIR%%/include/classes/api/services/CAlert.php
255
%%WWWDIR%%/include/classes/api/services/CAPIInfo.php
276
%%WWWDIR%%/include/classes/api/services/CAPIInfo.php
256
%%WWWDIR%%/include/classes/api/services/CApplication.php
277
%%WWWDIR%%/include/classes/api/services/CApplication.php
278
%%WWWDIR%%/include/classes/api/services/CAutoregistration.php
257
%%WWWDIR%%/include/classes/api/services/CConfiguration.php
279
%%WWWDIR%%/include/classes/api/services/CConfiguration.php
258
%%WWWDIR%%/include/classes/api/services/CCorrelation.php
280
%%WWWDIR%%/include/classes/api/services/CCorrelation.php
259
%%WWWDIR%%/include/classes/api/services/CDashboard.php
281
%%WWWDIR%%/include/classes/api/services/CDashboard.php
Lines 387-392 Link Here
387
%%WWWDIR%%/include/classes/html/CObject.php
409
%%WWWDIR%%/include/classes/html/CObject.php
388
%%WWWDIR%%/include/classes/html/CParam.php
410
%%WWWDIR%%/include/classes/html/CParam.php
389
%%WWWDIR%%/include/classes/html/CPassBox.php
411
%%WWWDIR%%/include/classes/html/CPassBox.php
412
%%WWWDIR%%/include/classes/html/CPatternSelect.php
390
%%WWWDIR%%/include/classes/html/CPre.php
413
%%WWWDIR%%/include/classes/html/CPre.php
391
%%WWWDIR%%/include/classes/html/CRadioButtonList.php
414
%%WWWDIR%%/include/classes/html/CRadioButtonList.php
392
%%WWWDIR%%/include/classes/html/CRangeControl.php
415
%%WWWDIR%%/include/classes/html/CRangeControl.php
Lines 404-409 Link Here
404
%%WWWDIR%%/include/classes/html/CTabView.php
427
%%WWWDIR%%/include/classes/html/CTabView.php
405
%%WWWDIR%%/include/classes/html/CTag.php
428
%%WWWDIR%%/include/classes/html/CTag.php
406
%%WWWDIR%%/include/classes/html/CTextArea.php
429
%%WWWDIR%%/include/classes/html/CTextArea.php
430
%%WWWDIR%%/include/classes/html/CTextAreaFlexible.php
407
%%WWWDIR%%/include/classes/html/CTextBox.php
431
%%WWWDIR%%/include/classes/html/CTextBox.php
408
%%WWWDIR%%/include/classes/html/CTriggersInfo.php
432
%%WWWDIR%%/include/classes/html/CTriggersInfo.php
409
%%WWWDIR%%/include/classes/html/CUiWidget.php
433
%%WWWDIR%%/include/classes/html/CUiWidget.php
Lines 417-422 Link Here
417
%%WWWDIR%%/include/classes/html/svg/CSvgGraphAnnotation.php
441
%%WWWDIR%%/include/classes/html/svg/CSvgGraphAnnotation.php
418
%%WWWDIR%%/include/classes/html/svg/CSvgGraphArea.php
442
%%WWWDIR%%/include/classes/html/svg/CSvgGraphArea.php
419
%%WWWDIR%%/include/classes/html/svg/CSvgGraphAxis.php
443
%%WWWDIR%%/include/classes/html/svg/CSvgGraphAxis.php
444
%%WWWDIR%%/include/classes/html/svg/CSvgGraphBar.php
420
%%WWWDIR%%/include/classes/html/svg/CSvgGraphGrid.php
445
%%WWWDIR%%/include/classes/html/svg/CSvgGraphGrid.php
421
%%WWWDIR%%/include/classes/html/svg/CSvgGraphLegend.php
446
%%WWWDIR%%/include/classes/html/svg/CSvgGraphLegend.php
422
%%WWWDIR%%/include/classes/html/svg/CSvgGraphLine.php
447
%%WWWDIR%%/include/classes/html/svg/CSvgGraphLine.php
Lines 444-451 Link Here
444
%%WWWDIR%%/include/classes/import/converters/C32ImportConverter.php
469
%%WWWDIR%%/include/classes/import/converters/C32ImportConverter.php
445
%%WWWDIR%%/include/classes/import/converters/C34ImportConverter.php
470
%%WWWDIR%%/include/classes/import/converters/C34ImportConverter.php
446
%%WWWDIR%%/include/classes/import/converters/C40ImportConverter.php
471
%%WWWDIR%%/include/classes/import/converters/C40ImportConverter.php
472
%%WWWDIR%%/include/classes/import/converters/C42ImportConverter.php
473
%%WWWDIR%%/include/classes/import/converters/CArrayKeysImportConverter.php
474
%%WWWDIR%%/include/classes/import/converters/CConstantImportConverter.php
447
%%WWWDIR%%/include/classes/import/converters/CConverter.php
475
%%WWWDIR%%/include/classes/import/converters/CConverter.php
448
%%WWWDIR%%/include/classes/import/converters/CConverterChain.php
476
%%WWWDIR%%/include/classes/import/converters/CDefaultValuesImportConverter.php
449
%%WWWDIR%%/include/classes/import/converters/CImportConverterFactory.php
477
%%WWWDIR%%/include/classes/import/converters/CImportConverterFactory.php
450
%%WWWDIR%%/include/classes/import/importers/CAbstractScreenImporter.php
478
%%WWWDIR%%/include/classes/import/importers/CAbstractScreenImporter.php
451
%%WWWDIR%%/include/classes/import/importers/CHostImporter.php
479
%%WWWDIR%%/include/classes/import/importers/CHostImporter.php
Lines 465-470 Link Here
465
%%WWWDIR%%/include/classes/import/validators/C34XmlValidator.php
493
%%WWWDIR%%/include/classes/import/validators/C34XmlValidator.php
466
%%WWWDIR%%/include/classes/import/validators/C40XmlValidator.php
494
%%WWWDIR%%/include/classes/import/validators/C40XmlValidator.php
467
%%WWWDIR%%/include/classes/import/validators/C42XmlValidator.php
495
%%WWWDIR%%/include/classes/import/validators/C42XmlValidator.php
496
%%WWWDIR%%/include/classes/import/validators/C44XmlValidator.php
497
%%WWWDIR%%/include/classes/import/validators/CImportValidatorFactory.php
468
%%WWWDIR%%/include/classes/import/validators/CXmlValidator.php
498
%%WWWDIR%%/include/classes/import/validators/CXmlValidator.php
469
%%WWWDIR%%/include/classes/import/validators/CXmlValidatorGeneral.php
499
%%WWWDIR%%/include/classes/import/validators/CXmlValidatorGeneral.php
470
%%WWWDIR%%/include/classes/items/CHelpItems.php
500
%%WWWDIR%%/include/classes/items/CHelpItems.php
Lines 544-550 Link Here
544
%%WWWDIR%%/include/classes/screens/CScreenMap.php
574
%%WWWDIR%%/include/classes/screens/CScreenMap.php
545
%%WWWDIR%%/include/classes/screens/CScreenPlainText.php
575
%%WWWDIR%%/include/classes/screens/CScreenPlainText.php
546
%%WWWDIR%%/include/classes/screens/CScreenProblem.php
576
%%WWWDIR%%/include/classes/screens/CScreenProblem.php
547
%%WWWDIR%%/include/classes/screens/CScreenScreen.php
548
%%WWWDIR%%/include/classes/screens/CScreenServerInfo.php
577
%%WWWDIR%%/include/classes/screens/CScreenServerInfo.php
549
%%WWWDIR%%/include/classes/screens/CScreenSimpleGraph.php
578
%%WWWDIR%%/include/classes/screens/CScreenSimpleGraph.php
550
%%WWWDIR%%/include/classes/screens/CScreenSystemStatus.php
579
%%WWWDIR%%/include/classes/screens/CScreenSystemStatus.php
Lines 588-602 Link Here
588
%%WWWDIR%%/include/classes/widgets/fields/CWidgetField.php
617
%%WWWDIR%%/include/classes/widgets/fields/CWidgetField.php
589
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldApplication.php
618
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldApplication.php
590
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldCheckBox.php
619
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldCheckBox.php
620
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldCheckBoxList.php
591
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldComboBox.php
621
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldComboBox.php
592
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldDatePicker.php
622
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldDatePicker.php
593
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldGraphDataSet.php
623
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldGraphDataSet.php
594
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldGraphOverride.php
624
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldGraphOverride.php
595
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldGroup.php
596
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldHidden.php
625
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldHidden.php
597
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldHost.php
626
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldHostPatternSelect.php
598
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldIntegerBox.php
627
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldIntegerBox.php
599
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldItem.php
628
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldMs.php
629
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldMsGraph.php
630
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldMsGraphPrototype.php
631
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldMsGroup.php
632
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldMsHost.php
633
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldMsItem.php
634
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldMsItemPrototype.php
600
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldNumericBox.php
635
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldNumericBox.php
601
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldRadioButtonList.php
636
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldRadioButtonList.php
602
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldRangeControl.php
637
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldRangeControl.php
Lines 604-610 Link Here
604
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldSelectResource.php
639
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldSelectResource.php
605
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldSeverities.php
640
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldSeverities.php
606
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldTags.php
641
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldTags.php
607
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldTextArea.php
608
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldTextBox.php
642
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldTextBox.php
609
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldUrl.php
643
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldUrl.php
610
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldWidgetListComboBox.php
644
%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldWidgetListComboBox.php
Lines 613-618 Link Here
613
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormClock.php
647
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormClock.php
614
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormDataOver.php
648
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormDataOver.php
615
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormGraph.php
649
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormGraph.php
650
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormGraphPrototype.php
651
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormHostAvail.php
616
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormMap.php
652
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormMap.php
617
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormNavTree.php
653
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormNavTree.php
618
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormPlainText.php
654
%%WWWDIR%%/include/classes/widgets/forms/CWidgetFormPlainText.php
Lines 631-636 Link Here
631
%%WWWDIR%%/include/classes/widgets/views/widget.favmaps.form.view.php
667
%%WWWDIR%%/include/classes/widgets/views/widget.favmaps.form.view.php
632
%%WWWDIR%%/include/classes/widgets/views/widget.favscreens.form.view.php
668
%%WWWDIR%%/include/classes/widgets/views/widget.favscreens.form.view.php
633
%%WWWDIR%%/include/classes/widgets/views/widget.graph.form.view.php
669
%%WWWDIR%%/include/classes/widgets/views/widget.graph.form.view.php
670
%%WWWDIR%%/include/classes/widgets/views/widget.graphprototype.form.view.php
671
%%WWWDIR%%/include/classes/widgets/views/widget.hostavail.form.view.php
634
%%WWWDIR%%/include/classes/widgets/views/widget.map.form.view.php
672
%%WWWDIR%%/include/classes/widgets/views/widget.map.form.view.php
635
%%WWWDIR%%/include/classes/widgets/views/widget.navtree.form.view.php
673
%%WWWDIR%%/include/classes/widgets/views/widget.navtree.form.view.php
636
%%WWWDIR%%/include/classes/widgets/views/widget.plaintext.form.view.php
674
%%WWWDIR%%/include/classes/widgets/views/widget.plaintext.form.view.php
Lines 642-647 Link Here
642
%%WWWDIR%%/include/classes/widgets/views/widget.trigover.form.view.php
680
%%WWWDIR%%/include/classes/widgets/views/widget.trigover.form.view.php
643
%%WWWDIR%%/include/classes/widgets/views/widget.url.form.view.php
681
%%WWWDIR%%/include/classes/widgets/views/widget.url.form.view.php
644
%%WWWDIR%%/include/classes/widgets/views/widget.web.form.view.php
682
%%WWWDIR%%/include/classes/widgets/views/widget.web.form.view.php
683
%%WWWDIR%%/include/classes/xml/CXmlConstantName.php
684
%%WWWDIR%%/include/classes/xml/CXmlConstantValue.php
645
%%WWWDIR%%/include/config.inc.php
685
%%WWWDIR%%/include/config.inc.php
646
%%WWWDIR%%/include/correlation.inc.php
686
%%WWWDIR%%/include/correlation.inc.php
647
%%WWWDIR%%/include/db.inc.php
687
%%WWWDIR%%/include/db.inc.php
Lines 700-707 Link Here
700
%%WWWDIR%%/include/views/administration.general.workingtime.edit.php
740
%%WWWDIR%%/include/views/administration.general.workingtime.edit.php
701
%%WWWDIR%%/include/views/administration.usergroups.edit.php
741
%%WWWDIR%%/include/views/administration.usergroups.edit.php
702
%%WWWDIR%%/include/views/administration.usergroups.list.php
742
%%WWWDIR%%/include/views/administration.usergroups.list.php
703
%%WWWDIR%%/include/views/administration.users.edit.php
704
%%WWWDIR%%/include/views/administration.users.list.php
705
%%WWWDIR%%/include/views/common.filter.trigger.php
743
%%WWWDIR%%/include/views/common.filter.trigger.php
706
%%WWWDIR%%/include/views/conf.import.php
744
%%WWWDIR%%/include/views/conf.import.php
707
%%WWWDIR%%/include/views/configuration.action.edit.php
745
%%WWWDIR%%/include/views/configuration.action.edit.php
Lines 761-770 Link Here
761
%%WWWDIR%%/include/views/js/administration.general.trigger.options.js.php
799
%%WWWDIR%%/include/views/js/administration.general.trigger.options.js.php
762
%%WWWDIR%%/include/views/js/administration.general.triggerSeverity.js.php
800
%%WWWDIR%%/include/views/js/administration.general.triggerSeverity.js.php
763
%%WWWDIR%%/include/views/js/administration.general.valuemapping.edit.js.php
801
%%WWWDIR%%/include/views/js/administration.general.valuemapping.edit.js.php
764
%%WWWDIR%%/include/views/js/administration.users.edit.js.php
765
%%WWWDIR%%/include/views/js/common.filter.trigger.js.php
802
%%WWWDIR%%/include/views/js/common.filter.trigger.js.php
766
%%WWWDIR%%/include/views/js/common.init.js.php
803
%%WWWDIR%%/include/views/js/common.init.js.php
767
%%WWWDIR%%/include/views/js/common.item.edit.js.php
804
%%WWWDIR%%/include/views/js/common.item.edit.js.php
805
%%WWWDIR%%/include/views/js/common.template.edit.js.php
768
%%WWWDIR%%/include/views/js/conf.import.js.php
806
%%WWWDIR%%/include/views/js/conf.import.js.php
769
%%WWWDIR%%/include/views/js/configuration.action.edit.js.php
807
%%WWWDIR%%/include/views/js/configuration.action.edit.js.php
770
%%WWWDIR%%/include/views/js/configuration.copy.elements.js.php
808
%%WWWDIR%%/include/views/js/configuration.copy.elements.js.php
Lines 862-867 Link Here
862
%%WWWDIR%%/js/multiselect.js
900
%%WWWDIR%%/js/multiselect.js
863
%%WWWDIR%%/js/pages/items.js
901
%%WWWDIR%%/js/pages/items.js
864
%%WWWDIR%%/js/servercheck.js
902
%%WWWDIR%%/js/servercheck.js
903
%%WWWDIR%%/js/textareaflexible.js
865
%%WWWDIR%%/js/vector/class.svg.canvas.js
904
%%WWWDIR%%/js/vector/class.svg.canvas.js
866
%%WWWDIR%%/js/vector/class.svg.map.js
905
%%WWWDIR%%/js/vector/class.svg.map.js
867
%%WWWDIR%%/js/vendors/jquery-ui.js
906
%%WWWDIR%%/js/vendors/jquery-ui.js
Lines 946-952 Link Here
946
%%WWWDIR%%/map.import.php
985
%%WWWDIR%%/map.import.php
947
%%WWWDIR%%/map.php
986
%%WWWDIR%%/map.php
948
%%WWWDIR%%/overview.php
987
%%WWWDIR%%/overview.php
949
%%WWWDIR%%/profile.php
950
%%WWWDIR%%/queue.php
988
%%WWWDIR%%/queue.php
951
%%WWWDIR%%/report2.php
989
%%WWWDIR%%/report2.php
952
%%WWWDIR%%/report4.php
990
%%WWWDIR%%/report4.php
Lines 968-974 Link Here
968
%%WWWDIR%%/trigger_prototypes.php
1006
%%WWWDIR%%/trigger_prototypes.php
969
%%WWWDIR%%/triggers.php
1007
%%WWWDIR%%/triggers.php
970
%%WWWDIR%%/usergrps.php
1008
%%WWWDIR%%/usergrps.php
971
%%WWWDIR%%/users.php
972
%%WWWDIR%%/zabbix.php
1009
%%WWWDIR%%/zabbix.php
973
@dir %%WWWDIR%%/local/app/controllers
1010
@dir %%WWWDIR%%/local/app/controllers
974
@dir %%WWWDIR%%/local/app/views
1011
@dir %%WWWDIR%%/local/app/views

Return to bug 241235